/ SGI Freeware 1999 August / SGI Freeware 1999 August.iso / dist / fw_emacs.idb / usr / freeware / share / emacs / 19.34 / lisp / ediff.elc.z / ediff.elc

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6b 77 7a 68 40 6e 75 |piled by| kwzh@nu|
|00000020| 74 72 69 6d 61 74 2e 67 | 6e 75 2e 61 69 2e 6d 69 |trimat.g|nu.ai.mi|
|00000030| 74 2e 65 64 75 20 6f 6e | 20 57 65 64 20 4a 75 6c |t.edu on| Wed Jul|
|00000040| 20 31 37 20 31 35 3a 34 | 34 3a 35 35 20 31 39 39 | 17 15:4|4:55 199|
|00000050| 36 0a 3b 3b 3b 20 66 72 | 6f 6d 20 66 69 6c 65 20 |6.;;; fr|om file |
|00000060| 2f 67 64 2f 67 6e 75 2f | 65 6d 61 63 73 2f 31 39 |/gd/gnu/|emacs/19|
|00000070| 2e 30 2f 6c 69 73 70 2f | 65 64 69 66 66 2e 65 6c |.0/lisp/|ediff.el|
|00000080| 0a 3b 3b 3b 20 65 6d 61 | 63 73 20 76 65 72 73 69 |.;;; ema|cs versi|
|00000090| 6f 6e 20 31 39 2e 33 31 | 2e 39 34 2e 31 2e 0a 3b |on 19.31|.94.1..;|
|000000a0| 3b 3b 20 62 79 74 65 63 | 6f 6d 70 20 76 65 72 73 |;; bytec|omp vers|
|000000b0| 69 6f 6e 20 46 53 46 20 | 32 2e 31 30 0a 3b 3b 3b |ion FSF |2.10.;;;|
|000000c0| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|000000d0| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|000000e0| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|000000f0| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000100| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 38 2e 0a |st in Em|acs 18..|
|00000110| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000120| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000130| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000140| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|00000150| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|00000160| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. |    (str|
|00000170| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|00000180| 76 65 72 73 69 6f 6e 20 | 22 31 39 2e 32 39 22 29 |version |"19.29")|
|00000190| 29 29 0a 20 20 20 20 28 | 65 72 72 6f 72 20 22 60 |)).    (|error "`|
|000001a0| 65 64 69 66 66 2e 65 6c | 27 20 77 61 73 20 63 6f |ediff.el|' was co|
|000001b0| 6d 70 69 6c 65 64 20 66 | 6f 72 20 45 6d 61 63 73 |mpiled f|or Emacs|
|000001c0| 20 31 39 2e 32 39 20 6f | 72 20 6c 61 74 65 72 22 | 19.29 o|r later"|
|000001d0| 29 29 0a 0a 0a 23 40 33 | 30 20 54 68 65 20 63 75 |))...#@3|0 The cu|
|000001e0| 72 72 65 6e 74 20 76 65 | 72 73 69 6f 6e 20 6f 66 |rrent ve|rsion of|
|000001f0| 20 45 64 69 66 66 1f 0a | 28 64 65 66 63 6f 6e 73 | Ediff..|(defcons|
|00000200| 74 20 65 64 69 66 66 2d | 76 65 72 73 69 6f 6e 20 |t ediff-|version |
|00000210| 22 32 2e 36 31 22 20 28 | 23 24 20 2e 20 34 37 34 |"2.61" (|#$ . 474|
|00000220| 29 29 0a 23 40 32 31 20 | 44 61 74 65 20 6f 66 20 |)).#@21 |Date of |
|00000230| 6c 61 73 74 20 75 70 64 | 61 74 65 1f 0a 28 64 65 |last upd|ate..(de|
|00000240| 66 63 6f 6e 73 74 20 65 | 64 69 66 66 2d 64 61 74 |fconst e|diff-dat|
|00000250| 65 20 22 4a 75 6e 65 20 | 31 30 2c 20 31 39 39 36 |e "June |10, 1996|
|00000260| 22 20 28 23 24 20 2e 20 | 35 35 32 29 29 0a 28 62 |" (#$ . |552)).(b|
|00000270| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c0 c2 |yte-code| "..!...|
|00000280| 21 87 22 20 5b 72 65 71 | 75 69 72 65 20 65 64 69 |!." [req|uire edi|
|00000290| 66 66 2d 69 6e 69 74 20 | 65 64 69 66 66 2d 6d 75 |ff-init |ediff-mu|
|000002a0| 6c 74 5d 20 32 29 0a 23 | 40 37 33 20 2a 49 66 20 |lt] 2).#|@73 *If |
|000002b0| 74 2c 20 45 64 69 66 66 | 20 75 73 65 73 20 70 72 |t, Ediff| uses pr|
|000002c0| 65 76 69 6f 75 73 20 64 | 69 72 65 63 74 6f 72 79 |evious d|irectory|
|000002d0| 20 61 73 20 64 65 66 61 | 75 6c 74 20 77 68 65 6e | as defa|ult when|
|000002e0| 20 72 65 61 64 69 6e 67 | 20 66 69 6c 65 20 6e 61 | reading| file na|
|000002f0| 6d 65 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |me...(de|fvar edi|
|00000300| 66 66 2d 75 73 65 2d 6c | 61 73 74 2d 64 69 72 20 |ff-use-l|ast-dir |
|00000310| 6e 69 6c 20 28 23 24 20 | 2e 20 2d 36 38 34 29 29 |nil (#$ |. -684))|
|00000320| 0a 23 40 35 33 20 4c 61 | 73 74 20 64 69 72 65 63 |.#@53 La|st direc|
|00000330| 74 6f 72 79 20 75 73 65 | 64 20 62 79 20 61 6e 20 |tory use|d by an |
|00000340| 45 64 69 66 66 20 63 6f | 6d 6d 61 6e 64 20 66 6f |Ediff co|mmand fo|
|00000350| 72 20 66 69 6c 65 2d 41 | 2e 1f 0a 28 64 65 66 76 |r file-A|...(defv|
|00000360| 61 72 20 65 64 69 66 66 | 2d 6c 61 73 74 2d 64 69 |ar ediff|-last-di|
|00000370| 72 2d 41 20 6e 69 6c 20 | 28 23 24 20 2e 20 38 30 |r-A nil |(#$ . 80|
|00000380| 36 29 29 0a 23 40 35 33 | 20 4c 61 73 74 20 64 69 |6)).#@53| Last di|
|00000390| 72 65 63 74 6f 72 79 20 | 75 73 65 64 20 62 79 20 |rectory |used by |
|000003a0| 61 6e 20 45 64 69 66 66 | 20 63 6f 6d 6d 61 6e 64 |an Ediff| command|
|000003b0| 20 66 6f 72 20 66 69 6c | 65 2d 42 2e 1f 0a 28 64 | for fil|e-B...(d|
|000003c0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 6c 61 73 74 |efvar ed|iff-last|
|000003d0| 2d 64 69 72 2d 42 20 6e | 69 6c 20 28 23 24 20 2e |-dir-B n|il (#$ .|
|000003e0| 20 39 30 35 29 29 0a 23 | 40 35 33 20 4c 61 73 74 | 905)).#|@53 Last|
|000003f0| 20 64 69 72 65 63 74 6f | 72 79 20 75 73 65 64 20 | directo|ry used |
|00000400| 62 79 20 61 6e 20 45 64 | 69 66 66 20 63 6f 6d 6d |by an Ed|iff comm|
|00000410| 61 6e 64 20 66 6f 72 20 | 66 69 6c 65 2d 43 2e 1f |and for |file-C..|
|00000420| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 6c |.(defvar| ediff-l|
|00000430| 61 73 74 2d 64 69 72 2d | 43 20 6e 69 6c 20 28 23 |ast-dir-|C nil (#|
|00000440| 24 20 2e 20 31 30 30 34 | 29 29 0a 23 40 36 34 20 |$ . 1004|)).#@64 |
|00000450| 4c 61 73 74 20 64 69 72 | 65 63 74 6f 72 79 20 75 |Last dir|ectory u|
|00000460| 73 65 64 20 62 79 20 61 | 6e 20 45 64 69 66 66 20 |sed by a|n Ediff |
|00000470| 63 6f 6d 6d 61 6e 64 20 | 66 6f 72 20 74 68 65 20 |command |for the |
|00000480| 61 6e 63 65 73 74 6f 72 | 20 66 69 6c 65 2e 1f 0a |ancestor| file...|
|00000490| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 6c 61 |(defvar |ediff-la|
|000004a0| 73 74 2d 64 69 72 2d 61 | 6e 63 65 73 74 6f 72 20 |st-dir-a|ncestor |
|000004b0| 6e 69 6c 20 28 23 24 20 | 2e 20 31 31 30 34 29 29 |nil (#$ |. 1104))|
|000004c0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 09 42 |.(byte-c|ode "..B|
|000004d0| 11 c2 09 42 11 c3 09 42 | 11 c0 87 22 20 5b 63 76 |...B...B|..." [cv|
|000004e0| 73 2d 63 6f 6f 6b 69 65 | 2d 68 61 6e 64 6c 65 20 |s-cookie|-handle |
|000004f0| 63 75 72 72 65 6e 74 2d | 6c 6f 61 64 2d 6c 69 73 |current-|load-lis|
|00000500| 74 20 65 64 69 66 66 2d | 6c 61 73 74 2d 64 69 72 |t ediff-|last-dir|
|00000510| 2d 70 61 74 63 68 20 65 | 64 69 66 66 2d 70 61 74 |-patch e|diff-pat|
|00000520| 63 68 2d 64 65 66 61 75 | 6c 74 2d 64 69 72 65 63 |ch-defau|lt-direc|
|00000530| 74 6f 72 79 5d 20 32 29 | 0a 28 64 65 66 61 6c 69 |tory] 2)|.(defali|
|00000540| 61 73 20 27 65 64 69 66 | 66 2d 73 65 74 2d 72 65 |as 'edif|f-set-re|
|00000550| 61 64 2d 6f 6e 6c 79 2d | 69 6e 2d 62 75 66 2d 41 |ad-only-|in-buf-A|
|00000560| 20 23 5b 6e 69 6c 20 22 | 70 18 09 83 20 00 c2 09 | #[nil "|p... ...|
|00000570| 21 83 20 00 c3 c2 09 21 | 21 83 20 00 c4 8e 09 71 |!. ....!|!. ....q|
|00000580| 88 c5 c6 21 29 82 2b 00 | 0e 07 c8 3d 86 2b 00 c9 |...!).+.|...=.+..|
|00000590| 0e 5c 6e 21 29 87 22 20 | 5b 53 74 61 72 74 42 75 |.\n!)." |[StartBu|
|000005a0| 66 66 65 72 20 65 64 69 | 66 66 2d 62 75 66 66 65 |ffer edi|ff-buffe|
|000005b0| 72 2d 41 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |r-A get-|buffer b|
|000005c0| 75 66 66 65 72 2d 6e 61 | 6d 65 20 28 28 73 65 74 |uffer-na|me ((set|
|000005d0| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|000005e0| 66 65 72 29 29 20 74 6f | 67 67 6c 65 2d 72 65 61 |fer)) to|ggle-rea|
|000005f0| 64 2d 6f 6e 6c 79 20 31 | 20 74 68 69 73 2d 63 6f |d-only 1| this-co|
|00000600| 6d 6d 61 6e 64 20 65 64 | 69 66 66 2d 71 75 69 74 |mmand ed|iff-quit|
|00000610| 20 65 72 72 6f 72 20 65 | 64 69 66 66 2d 4b 49 4c | error e|diff-KIL|
|00000620| 4c 45 44 2d 56 49 54 41 | 4c 2d 42 55 46 46 45 52 |LED-VITA|L-BUFFER|
|00000630| 5d 20 33 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |] 3]).(d|efalias |
|00000640| 27 65 64 69 66 66 2d 67 | 65 74 2d 64 65 66 61 75 |'ediff-g|et-defau|
|00000650| 6c 74 2d 66 69 6c 65 2d | 6e 61 6d 65 20 23 5b 6e |lt-file-|name #[n|
|00000660| 69 6c 20 22 08 c1 3d 83 | 1a 00 c2 c3 c4 5c 22 89 |il "..=.|.....\".|
|00000670| 1d 3b 85 18 00 c6 0d 21 | 3f 85 18 00 0d 29 87 c7 |.;.....!|?....)..|
|00000680| 70 21 85 25 00 c8 c7 70 | 21 21 87 22 20 5b 6d 61 |p!.%...p|!!." [ma|
|00000690| 6a 6f 72 2d 6d 6f 64 65 | 20 64 69 72 65 64 2d 6d |jor-mode| dired-m|
|000006a0| 6f 64 65 20 64 69 72 65 | 64 2d 67 65 74 2d 66 69 |ode dire|d-get-fi|
|000006b0| 6c 65 6e 61 6d 65 20 6e | 69 6c 20 6e 6f 2d 65 72 |lename n|il no-er|
|000006c0| 72 6f 72 20 66 20 66 69 | 6c 65 2d 64 69 72 65 63 |ror f fi|le-direc|
|000006d0| 74 6f 72 79 2d 70 20 62 | 75 66 66 65 72 2d 66 69 |tory-p b|uffer-fi|
|000006e0| 6c 65 2d 6e 61 6d 65 20 | 66 69 6c 65 2d 6e 61 6d |le-name |file-nam|
|000006f0| 65 2d 6e 6f 6e 64 69 72 | 65 63 74 6f 72 79 5d 20 |e-nondir|ectory] |
|00000700| 34 5d 29 0a 23 40 35 30 | 20 52 75 6e 20 45 64 69 |4]).#@50| Run Edi|
|00000710| 66 66 20 6f 6e 20 61 20 | 70 61 69 72 20 6f 66 20 |ff on a |pair of |
|00000720| 66 69 6c 65 73 2c 20 46 | 49 4c 45 2d 41 20 61 6e |files, F|ILE-A an|
|00000730| 64 20 46 49 4c 45 2d 42 | 2e 1f 0a 28 64 65 66 61 |d FILE-B|...(defa|
|00000740| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 66 69 6c 65 |lias 'ed|iff-file|
|00000750| 73 20 23 5b 28 66 69 6c | 65 2d 41 20 66 69 6c 65 |s #[(fil|e-A file|
|00000760| 2d 42 20 26 6f 70 74 69 | 6f 6e 61 6c 20 73 74 61 |-B &opti|onal sta|
|00000770| 72 74 75 70 2d 68 6f 6f | 6b 73 29 20 22 c0 09 c2 |rtup-hoo|ks) "...|
|00000780| 0b 21 83 11 00 c4 c5 09 | 21 0b 5c 22 82 12 00 0b |.!......|!.\"....|
|00000790| c6 0e 07 c8 25 87 22 20 | 5b 65 64 69 66 66 2d 66 |....%." |[ediff-f|
|000007a0| 69 6c 65 73 2d 69 6e 74 | 65 72 6e 61 6c 20 66 69 |iles-int|ernal fi|
|000007b0| 6c 65 2d 41 20 66 69 6c | 65 2d 64 69 72 65 63 74 |le-A fil|e-direct|
|000007c0| 6f 72 79 2d 70 20 66 69 | 6c 65 2d 42 20 65 78 70 |ory-p fi|le-B exp|
|000007d0| 61 6e 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 66 69 |and-file|-name fi|
|000007e0| 6c 65 2d 6e 61 6d 65 2d | 6e 6f 6e 64 69 72 65 63 |le-name-|nondirec|
|000007f0| 74 6f 72 79 20 6e 69 6c | 20 73 74 61 72 74 75 70 |tory nil| startup|
|00000800| 2d 68 6f 6f 6b 73 20 65 | 64 69 66 66 2d 66 69 6c |-hooks e|diff-fil|
|00000810| 65 73 5d 20 36 20 28 23 | 24 20 2e 20 31 38 30 31 |es] 6 (#|$ . 1801|
|00000820| 29 20 28 6c 65 74 20 28 | 28 64 69 72 2d 41 20 28 |) (let (|(dir-A (|
|00000830| 69 66 20 65 64 69 66 66 | 2d 75 73 65 2d 6c 61 73 |if ediff|-use-las|
|00000840| 74 2d 64 69 72 20 65 64 | 69 66 66 2d 6c 61 73 74 |t-dir ed|iff-last|
|00000850| 2d 64 69 72 2d 41 20 64 | 65 66 61 75 6c 74 2d 64 |-dir-A d|efault-d|
|00000860| 69 72 65 63 74 6f 72 79 | 29 29 20 64 69 72 2d 42 |irectory|)) dir-B|
|00000870| 20 66 29 20 28 6c 69 73 | 74 20 28 73 65 74 71 20 | f) (lis|t (setq |
|00000880| 66 20 28 65 64 69 66 66 | 2d 72 65 61 64 2d 66 69 |f (ediff|-read-fi|
|00000890| 6c 65 2d 6e 61 6d 65 20 | 22 46 69 6c 65 20 41 20 |le-name |"File A |
|000008a0| 74 6f 20 63 6f 6d 70 61 | 72 65 22 20 64 69 72 2d |to compa|re" dir-|
|000008b0| 41 20 28 65 64 69 66 66 | 2d 67 65 74 2d 64 65 66 |A (ediff|-get-def|
|000008c0| 61 75 6c 74 2d 66 69 6c | 65 2d 6e 61 6d 65 29 29 |ault-fil|e-name))|
|000008d0| 29 20 28 65 64 69 66 66 | 2d 72 65 61 64 2d 66 69 |) (ediff|-read-fi|
|000008e0| 6c 65 2d 6e 61 6d 65 20 | 22 46 69 6c 65 20 42 20 |le-name |"File B |
|000008f0| 74 6f 20 63 6f 6d 70 61 | 72 65 22 20 28 73 65 74 |to compa|re" (set|
|00000900| 71 20 64 69 72 2d 42 20 | 28 69 66 20 65 64 69 66 |q dir-B |(if edif|
|00000910| 66 2d 75 73 65 2d 6c 61 | 73 74 2d 64 69 72 20 65 |f-use-la|st-dir e|
|00000920| 64 69 66 66 2d 6c 61 73 | 74 2d 64 69 72 2d 42 20 |diff-las|t-dir-B |
|00000930| 28 66 69 6c 65 2d 6e 61 | 6d 65 2d 64 69 72 65 63 |(file-na|me-direc|
|00000940| 74 6f 72 79 20 66 29 29 | 29 20 28 70 72 6f 67 6e |tory f))|) (progn|
|00000950| 20 28 73 65 74 71 20 66 | 69 6c 65 2d 6e 61 6d 65 | (setq f|ile-name|
|00000960| 2d 68 69 73 74 6f 72 79 | 20 28 63 6f 6e 73 20 28 |-history| (cons (|
|00000970| 65 64 69 66 66 2d 61 62 | 62 72 65 76 69 61 74 65 |ediff-ab|breviate|
|00000980| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 28 65 78 70 61 |-file-na|me (expa|
|00000990| 6e 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 28 66 69 |nd-file-|name (fi|
|000009a0| 6c 65 2d 6e 61 6d 65 2d | 6e 6f 6e 64 69 72 65 63 |le-name-|nondirec|
|000009b0| 74 6f 72 79 20 66 29 20 | 64 69 72 2d 42 29 29 20 |tory f) |dir-B)) |
|000009c0| 66 69 6c 65 2d 6e 61 6d | 65 2d 68 69 73 74 6f 72 |file-nam|e-histor|
|000009d0| 79 29 29 20 66 29 29 29 | 29 5d 29 0a 23 40 35 35 |y)) f)))|)]).#@55|
|000009e0| 20 52 75 6e 20 45 64 69 | 66 66 20 6f 6e 20 74 68 | Run Edi|ff on th|
|000009f0| 72 65 65 20 66 69 6c 65 | 73 2c 20 46 49 4c 45 2d |ree file|s, FILE-|
|00000a00| 41 2c 20 46 49 4c 45 2d | 42 2c 20 61 6e 64 20 46 |A, FILE-|B, and F|
|00000a10| 49 4c 45 2d 43 2e 1f 0a | 28 64 65 66 61 6c 69 61 |ILE-C...|(defalia|
|00000a20| 73 20 27 65 64 69 66 66 | 2d 66 69 6c 65 73 33 20 |s 'ediff|-files3 |
|00000a30| 23 5b 28 66 69 6c 65 2d | 41 20 66 69 6c 65 2d 42 |#[(file-|A file-B|
|00000a40| 20 66 69 6c 65 2d 43 20 | 26 6f 70 74 69 6f 6e 61 | file-C |&optiona|
|00000a50| 6c 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 29 |l startu|p-hooks)|
|00000a60| 20 22 c0 09 c2 0b 21 83 | 11 00 c4 c5 09 21 0b 5c | "....!.|.....!.\|
|00000a70| 22 82 12 00 0b c2 0e 06 | 21 83 23 00 c4 c5 09 21 |".......|!.#....!|
|00000a80| 0e 06 5c 22 82 25 00 0e | 06 0e 07 c8 25 87 22 20 |..\".%..|....%." |
|00000a90| 5b 65 64 69 66 66 2d 66 | 69 6c 65 73 2d 69 6e 74 |[ediff-f|iles-int|
|00000aa0| 65 72 6e 61 6c 20 66 69 | 6c 65 2d 41 20 66 69 6c |ernal fi|le-A fil|
|00000ab0| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 70 20 66 69 |e-direct|ory-p fi|
|00000ac0| 6c 65 2d 42 20 65 78 70 | 61 6e 64 2d 66 69 6c 65 |le-B exp|and-file|
|00000ad0| 2d 6e 61 6d 65 20 66 69 | 6c 65 2d 6e 61 6d 65 2d |-name fi|le-name-|
|00000ae0| 6e 6f 6e 64 69 72 65 63 | 74 6f 72 79 20 66 69 6c |nondirec|tory fil|
|00000af0| 65 2d 43 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |e-C star|tup-hook|
|00000b00| 73 20 65 64 69 66 66 2d | 66 69 6c 65 73 33 5d 20 |s ediff-|files3] |
|00000b10| 36 20 28 23 24 20 2e 20 | 32 35 32 39 29 20 28 6c |6 (#$ . |2529) (l|
|00000b20| 65 74 20 28 28 64 69 72 | 2d 41 20 28 69 66 20 65 |et ((dir|-A (if e|
|00000b30| 64 69 66 66 2d 75 73 65 | 2d 6c 61 73 74 2d 64 69 |diff-use|-last-di|
|00000b40| 72 20 65 64 69 66 66 2d | 6c 61 73 74 2d 64 69 72 |r ediff-|last-dir|
|00000b50| 2d 41 20 64 65 66 61 75 | 6c 74 2d 64 69 72 65 63 |-A defau|lt-direc|
|00000b60| 74 6f 72 79 29 29 20 64 | 69 72 2d 42 20 64 69 72 |tory)) d|ir-B dir|
|00000b70| 2d 43 20 66 20 66 66 29 | 20 28 6c 69 73 74 20 28 |-C f ff)| (list (|
|00000b80| 73 65 74 71 20 66 20 28 | 65 64 69 66 66 2d 72 65 |setq f (|ediff-re|
|00000b90| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 46 69 |ad-file-|name "Fi|
|00000ba0| 6c 65 20 41 20 74 6f 20 | 63 6f 6d 70 61 72 65 22 |le A to |compare"|
|00000bb0| 20 64 69 72 2d 41 20 28 | 65 64 69 66 66 2d 67 65 | dir-A (|ediff-ge|
|00000bc0| 74 2d 64 65 66 61 75 6c | 74 2d 66 69 6c 65 2d 6e |t-defaul|t-file-n|
|00000bd0| 61 6d 65 29 29 29 20 28 | 73 65 74 71 20 66 66 20 |ame))) (|setq ff |
|00000be0| 28 65 64 69 66 66 2d 72 | 65 61 64 2d 66 69 6c 65 |(ediff-r|ead-file|
|00000bf0| 2d 6e 61 6d 65 20 22 46 | 69 6c 65 20 42 20 74 6f |-name "F|ile B to|
|00000c00| 20 63 6f 6d 70 61 72 65 | 22 20 28 73 65 74 71 20 | compare|" (setq |
|00000c10| 64 69 72 2d 42 20 28 69 | 66 20 65 64 69 66 66 2d |dir-B (i|f ediff-|
|00000c20| 75 73 65 2d 6c 61 73 74 | 2d 64 69 72 20 65 64 69 |use-last|-dir edi|
|00000c30| 66 66 2d 6c 61 73 74 2d | 64 69 72 2d 42 20 28 66 |ff-last-|dir-B (f|
|00000c40| 69 6c 65 2d 6e 61 6d 65 | 2d 64 69 72 65 63 74 6f |ile-name|-directo|
|00000c50| 72 79 20 66 29 29 29 20 | 28 70 72 6f 67 6e 20 28 |ry f))) |(progn (|
|00000c60| 73 65 74 71 20 66 69 6c | 65 2d 6e 61 6d 65 2d 68 |setq fil|e-name-h|
|00000c70| 69 73 74 6f 72 79 20 28 | 63 6f 6e 73 20 28 65 64 |istory (|cons (ed|
|00000c80| 69 66 66 2d 61 62 62 72 | 65 76 69 61 74 65 2d 66 |iff-abbr|eviate-f|
|00000c90| 69 6c 65 2d 6e 61 6d 65 | 20 28 65 78 70 61 6e 64 |ile-name| (expand|
|00000ca0| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 28 66 69 6c 65 |-file-na|me (file|
|00000cb0| 2d 6e 61 6d 65 2d 6e 6f | 6e 64 69 72 65 63 74 6f |-name-no|ndirecto|
|00000cc0| 72 79 20 66 29 20 64 69 | 72 2d 42 29 29 20 66 69 |ry f) di|r-B)) fi|
|00000cd0| 6c 65 2d 6e 61 6d 65 2d | 68 69 73 74 6f 72 79 29 |le-name-|history)|
|00000ce0| 29 20 66 29 29 29 20 28 | 65 64 69 66 66 2d 72 65 |) f))) (|ediff-re|
|00000cf0| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 46 69 |ad-file-|name "Fi|
|00000d00| 6c 65 20 43 20 74 6f 20 | 63 6f 6d 70 61 72 65 22 |le C to |compare"|
|00000d10| 20 28 73 65 74 71 20 64 | 69 72 2d 43 20 28 69 66 | (setq d|ir-C (if|
|00000d20| 20 65 64 69 66 66 2d 75 | 73 65 2d 6c 61 73 74 2d | ediff-u|se-last-|
|00000d30| 64 69 72 20 65 64 69 66 | 66 2d 6c 61 73 74 2d 64 |dir edif|f-last-d|
|00000d40| 69 72 2d 43 20 28 66 69 | 6c 65 2d 6e 61 6d 65 2d |ir-C (fi|le-name-|
|00000d50| 64 69 72 65 63 74 6f 72 | 79 20 66 66 29 29 29 20 |director|y ff))) |
|00000d60| 28 70 72 6f 67 6e 20 28 | 73 65 74 71 20 66 69 6c |(progn (|setq fil|
|00000d70| 65 2d 6e 61 6d 65 2d 68 | 69 73 74 6f 72 79 20 28 |e-name-h|istory (|
|00000d80| 63 6f 6e 73 20 28 65 64 | 69 66 66 2d 61 62 62 72 |cons (ed|iff-abbr|
|00000d90| 65 76 69 61 74 65 2d 66 | 69 6c 65 2d 6e 61 6d 65 |eviate-f|ile-name|
|00000da0| 20 28 65 78 70 61 6e 64 | 2d 66 69 6c 65 2d 6e 61 | (expand|-file-na|
|00000db0| 6d 65 20 28 66 69 6c 65 | 2d 6e 61 6d 65 2d 6e 6f |me (file|-name-no|
|00000dc0| 6e 64 69 72 65 63 74 6f | 72 79 20 66 66 29 20 64 |ndirecto|ry ff) d|
|00000dd0| 69 72 2d 43 29 29 20 66 | 69 6c 65 2d 6e 61 6d 65 |ir-C)) f|ile-name|
|00000de0| 2d 68 69 73 74 6f 72 79 | 29 29 20 66 66 29 29 29 |-history|)) ff)))|
|00000df0| 29 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 28 71 |)]).(def|alias (q|
|00000e00| 75 6f 74 65 20 65 64 69 | 66 66 33 29 20 28 71 75 |uote edi|ff3) (qu|
|00000e10| 6f 74 65 20 65 64 69 66 | 66 2d 66 69 6c 65 73 33 |ote edif|f-files3|
|00000e20| 29 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |)).(defa|lias 'ed|
|00000e30| 69 66 66 2d 66 69 6e 64 | 2d 66 69 6c 65 20 23 5b |iff-find|-file #[|
|00000e40| 28 66 69 6c 65 2d 76 61 | 72 20 62 75 66 66 65 72 |(file-va|r buffer|
|00000e50| 2d 6e 61 6d 65 20 26 6f | 70 74 69 6f 6e 61 6c 20 |-name &o|ptional |
|00000e60| 6c 61 73 74 2d 64 69 72 | 20 68 6f 6f 6b 73 2d 76 |last-dir| hooks-v|
|00000e70| 61 72 29 20 22 08 4a 19 | c2 09 c3 5c 22 1c c5 09 |ar) ".J.|...\"...|
|00000e80| 21 1e 06 c7 09 21 84 1b | 00 c8 c9 09 5c 22 88 82 |!....!..|....\"..|
|00000e90| 26 00 ca 09 21 83 26 00 | c8 cb 09 5c 22 88 cc 09 |&...!.&.|...\"...|
|00000ea0| 21 11 0e 0d 83 38 00 0e | 0d cc ce 09 21 21 4c 88 |!....8..|....!!L.|
|00000eb0| 0e 0f c3 09 21 4c 88 70 | 1e 10 0e 0f 4a 83 ab 00 |....!L.p|....J...|
|00000ec0| d1 0e 0f 4a 21 83 ab 00 | cf d1 0e 0f 4a 21 21 83 |...J!...|....J!!.|
|00000ed0| ab 00 d2 8e 0e 0f 4a 71 | 88 7e 88 5c 66 83 82 00 |......Jq|.~.\f...|
|00000ee0| d3 d4 21 88 d5 70 0e 06 | 5c 22 11 0e 16 d7 d8 d9 |..!..p..|\"......|
|00000ef0| 09 44 45 0e 16 4a 42 4c | 88 82 a7 00 da 09 21 da |.DE..JBL|......!.|
|00000f00| db 20 21 9a 84 a4 00 d5 | 70 0e 06 5c 22 11 0e 16 |. !.....|p..\"...|
|00000f10| d7 d8 d9 09 44 45 0e 16 | 4a 42 4c 88 82 a7 00 d3 |....DE..|JBL.....|
|00000f20| 20 88 29 82 b7 00 0e 1c | dd 3d 84 b7 00 c8 0e 1e | .).....|.=......|
|00000f30| 21 88 29 08 09 4c 2b 87 | 22 20 5b 66 69 6c 65 2d |!.)..L+.|" [file-|
|00000f40| 76 61 72 20 66 69 6c 65 | 20 66 69 6e 64 2d 66 69 |var file| find-fi|
|00000f50| 6c 65 2d 6e 61 6d 65 2d | 68 61 6e 64 6c 65 72 20 |le-name-|handler |
|00000f60| 66 69 6e 64 2d 66 69 6c | 65 2d 6e 6f 73 65 6c 65 |find-fil|e-nosele|
|00000f70| 63 74 20 66 69 6c 65 2d | 6d 61 67 69 63 20 66 69 |ct file-|magic fi|
|00000f80| 6c 65 2d 6e 61 6d 65 2d | 6e 6f 6e 64 69 72 65 63 |le-name-|nondirec|
|00000f90| 74 6f 72 79 20 74 65 6d | 70 2d 66 69 6c 65 2d 6e |tory tem|p-file-n|
|00000fa0| 61 6d 65 2d 70 72 65 66 | 69 78 20 66 69 6c 65 2d |ame-pref|ix file-|
|00000fb0| 72 65 61 64 61 62 6c 65 | 2d 70 20 65 72 72 6f 72 |readable|-p error|
|00000fc0| 20 22 46 69 6c 65 20 60 | 25 73 27 20 64 6f 65 73 | "File `|%s' does|
|00000fd0| 20 6e 6f 74 20 65 78 69 | 73 74 20 6f 72 20 69 73 | not exi|st or is|
|00000fe0| 20 6e 6f 74 20 72 65 61 | 64 61 62 6c 65 22 20 66 | not rea|dable" f|
|00000ff0| 69 6c 65 2d 64 69 72 65 | 63 74 6f 72 79 2d 70 20 |ile-dire|ctory-p |
|00001000| 22 46 69 6c 65 20 60 25 | 73 27 20 69 73 20 61 20 |"File `%|s' is a |
|00001010| 64 69 72 65 63 74 6f 72 | 79 22 20 65 78 70 61 6e |director|y" expan|
|00001020| 64 2d 66 69 6c 65 2d 6e | 61 6d 65 20 6c 61 73 74 |d-file-n|ame last|
|00001030| 2d 64 69 72 20 66 69 6c | 65 2d 6e 61 6d 65 2d 64 |-dir fil|e-name-d|
|00001040| 69 72 65 63 74 6f 72 79 | 20 62 75 66 66 65 72 2d |irectory| buffer-|
|00001050| 6e 61 6d 65 20 53 74 61 | 72 74 42 75 66 66 65 72 |name Sta|rtBuffer|
|00001060| 20 67 65 74 2d 62 75 66 | 66 65 72 20 28 28 73 65 | get-buf|fer ((se|
|00001070| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|00001080| 66 66 65 72 29 29 20 65 | 64 69 66 66 2d 76 65 72 |ffer)) e|diff-ver|
|00001090| 69 66 79 2d 66 69 6c 65 | 2d 62 75 66 66 65 72 20 |ify-file|-buffer |
|000010a0| 6d 61 67 69 63 20 65 64 | 69 66 66 2d 6d 61 6b 65 |magic ed|iff-make|
|000010b0| 2d 74 65 6d 70 2d 66 69 | 6c 65 20 68 6f 6f 6b 73 |-temp-fi|le hooks|
|000010c0| 2d 76 61 72 20 6c 61 6d | 62 64 61 20 6e 69 6c 20 |-var lam|bda nil |
|000010d0| 64 65 6c 65 74 65 2d 66 | 69 6c 65 20 66 69 6c 65 |delete-f|ile file|
|000010e0| 2d 74 72 75 65 6e 61 6d | 65 20 62 75 66 66 65 72 |-truenam|e buffer|
|000010f0| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 74 68 69 73 2d |-file-na|me this-|
|00001100| 63 6f 6d 6d 61 6e 64 20 | 65 64 69 66 66 2d 71 75 |command |ediff-qu|
|00001110| 69 74 20 65 64 69 66 66 | 2d 4b 49 4c 4c 45 44 2d |it ediff|-KILLED-|
|00001120| 56 49 54 41 4c 2d 42 55 | 46 46 45 52 5d 20 35 5d |VITAL-BU|FFER] 5]|
|00001130| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00001140| 66 66 2d 66 69 6c 65 73 | 2d 69 6e 74 65 72 6e 61 |ff-files|-interna|
|00001150| 6c 20 23 5b 28 66 69 6c | 65 2d 41 20 66 69 6c 65 |l #[(fil|e-A file|
|00001160| 2d 42 20 66 69 6c 65 2d | 43 20 73 74 61 72 74 75 |-B file-|C startu|
|00001170| 70 2d 68 6f 6f 6b 73 20 | 6a 6f 62 2d 6e 61 6d 65 |p-hooks |job-name|
|00001180| 29 20 22 c0 89 89 19 1a | 1b c4 c5 0e 06 5c 22 88 |) ".....|.....\".|
|00001190| c7 c6 c3 c8 c9 24 88 c4 | c5 0e 5c 6e 5c 22 88 c7 |.....$..|..\n\"..|
|000011a0| ca c2 cb c9 24 88 0e 5c | 66 3b 83 3e 00 c4 c5 0e |....$..\|f;.>....|
|000011b0| 5c 66 5c 22 88 c7 cc c1 | 0e 0d ce 3d 83 3a 00 cf |\f\"....|...=.:..|
|000011c0| 82 3b 00 d0 c9 24 88 d1 | 0b 0e 06 5c 6e 0e 5c 6e |.;...$..|...\n.\n|
|000011d0| 09 0e 5c 66 0e 09 d2 0e | 0d 42 43 26 08 2b 87 22 |..\f....|.BC&.+."|
|000011e0| 20 5b 6e 69 6c 20 62 75 | 66 2d 43 20 62 75 66 2d | [nil bu|f-C buf-|
|000011f0| 42 20 62 75 66 2d 41 20 | 6d 65 73 73 61 67 65 20 |B buf-A |message |
|00001200| 22 52 65 61 64 69 6e 67 | 20 66 69 6c 65 20 25 73 |"Reading| file %s|
|00001210| 20 2e 2e 2e 20 22 20 66 | 69 6c 65 2d 41 20 65 64 | ... " f|ile-A ed|
|00001220| 69 66 66 2d 66 69 6e 64 | 2d 66 69 6c 65 20 65 64 |iff-find|-file ed|
|00001230| 69 66 66 2d 6c 61 73 74 | 2d 64 69 72 2d 41 20 73 |iff-last|-dir-A s|
|00001240| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 66 69 6c |tartup-h|ooks fil|
|00001250| 65 2d 42 20 65 64 69 66 | 66 2d 6c 61 73 74 2d 64 |e-B edif|f-last-d|
|00001260| 69 72 2d 42 20 66 69 6c | 65 2d 43 20 6a 6f 62 2d |ir-B fil|e-C job-|
|00001270| 6e 61 6d 65 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |name edi|ff-merge|
|00001280| 2d 66 69 6c 65 73 2d 77 | 69 74 68 2d 61 6e 63 65 |-files-w|ith-ance|
|00001290| 73 74 6f 72 20 65 64 69 | 66 66 2d 6c 61 73 74 2d |stor edi|ff-last-|
|000012a0| 64 69 72 2d 61 6e 63 65 | 73 74 6f 72 20 65 64 69 |dir-ance|stor edi|
|000012b0| 66 66 2d 6c 61 73 74 2d | 64 69 72 2d 43 20 65 64 |ff-last-|dir-C ed|
|000012c0| 69 66 66 2d 73 65 74 75 | 70 20 65 64 69 66 66 2d |iff-setu|p ediff-|
|000012d0| 6a 6f 62 2d 6e 61 6d 65 | 5d 20 31 30 5d 29 0a 28 |job-name|] 10]).(|
|000012e0| 64 65 66 61 6c 69 61 73 | 20 28 71 75 6f 74 65 20 |defalias| (quote |
|000012f0| 65 64 69 66 66 29 20 28 | 71 75 6f 74 65 20 65 64 |ediff) (|quote ed|
|00001300| 69 66 66 2d 66 69 6c 65 | 73 29 29 0a 23 40 35 36 |iff-file|s)).#@56|
|00001310| 20 52 75 6e 20 45 64 69 | 66 66 20 6f 6e 20 61 20 | Run Edi|ff on a |
|00001320| 70 61 69 72 20 6f 66 20 | 62 75 66 66 65 72 73 2c |pair of |buffers,|
|00001330| 20 42 55 46 46 45 52 2d | 41 20 61 6e 64 20 42 55 | BUFFER-|A and BU|
|00001340| 46 46 45 52 2d 42 2e 1f | 0a 28 64 65 66 61 6c 69 |FFER-B..|.(defali|
|00001350| 61 73 20 27 65 64 69 66 | 66 2d 62 75 66 66 65 72 |as 'edif|f-buffer|
|00001360| 73 20 23 5b 28 62 75 66 | 66 65 72 2d 41 20 62 75 |s #[(buf|fer-A bu|
|00001370| 66 66 65 72 2d 42 20 26 | 6f 70 74 69 6f 6e 61 6c |ffer-B &|optional|
|00001380| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 20 6a | startup|-hooks j|
|00001390| 6f 62 2d 6e 61 6d 65 29 | 20 22 08 84 06 00 c1 10 |ob-name)| "......|
|000013a0| c2 0b 5c 66 c5 0e 06 08 | 25 87 22 20 5b 6a 6f 62 |..\f....|%." [job|
|000013b0| 2d 6e 61 6d 65 20 65 64 | 69 66 66 2d 62 75 66 66 |-name ed|iff-buff|
|000013c0| 65 72 73 20 65 64 69 66 | 66 2d 62 75 66 66 65 72 |ers edif|f-buffer|
|000013d0| 73 2d 69 6e 74 65 72 6e | 61 6c 20 62 75 66 66 65 |s-intern|al buffe|
|000013e0| 72 2d 41 20 62 75 66 66 | 65 72 2d 42 20 6e 69 6c |r-A buff|er-B nil|
|000013f0| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 5d 20 | startup|-hooks] |
|00001400| 36 20 28 23 24 20 2e 20 | 34 38 38 31 29 20 28 6c |6 (#$ . |4881) (l|
|00001410| 65 74 20 28 62 66 29 20 | 28 6c 69 73 74 20 28 73 |et (bf) |(list (s|
|00001420| 65 74 71 20 62 66 20 28 | 72 65 61 64 2d 62 75 66 |etq bf (|read-buf|
|00001430| 66 65 72 20 22 42 75 66 | 66 65 72 20 41 20 74 6f |fer "Buf|fer A to|
|00001440| 20 63 6f 6d 70 61 72 65 | 3a 20 22 20 28 65 64 69 | compare|: " (edi|
|00001450| 66 66 2d 6f 74 68 65 72 | 2d 62 75 66 66 65 72 20 |ff-other|-buffer |
|00001460| 22 22 29 20 74 29 29 20 | 28 72 65 61 64 2d 62 75 |"") t)) |(read-bu|
|00001470| 66 66 65 72 20 22 42 75 | 66 66 65 72 20 42 20 74 |ffer "Bu|ffer B t|
|00001480| 6f 20 63 6f 6d 70 61 72 | 65 3a 20 22 20 28 70 72 |o compar|e: " (pr|
|00001490| 6f 67 6e 20 28 73 61 76 | 65 2d 77 69 6e 64 6f 77 |ogn (sav|e-window|
|000014a0| 2d 65 78 63 75 72 73 69 | 6f 6e 20 28 6f 74 68 65 |-excursi|on (othe|
|000014b0| 72 2d 77 69 6e 64 6f 77 | 20 31 29 29 20 28 65 64 |r-window| 1)) (ed|
|000014c0| 69 66 66 2d 6f 74 68 65 | 72 2d 62 75 66 66 65 72 |iff-othe|r-buffer|
|000014d0| 20 62 66 29 29 20 74 29 | 29 29 5d 29 0a 28 64 65 | bf)) t)|))]).(de|
|000014e0| 66 61 6c 69 61 73 20 28 | 71 75 6f 74 65 20 65 62 |falias (|quote eb|
|000014f0| 75 66 66 65 72 73 29 20 | 28 71 75 6f 74 65 20 65 |uffers) |(quote e|
|00001500| 64 69 66 66 2d 62 75 66 | 66 65 72 73 29 29 0a 23 |diff-buf|fers)).#|
|00001510| 40 36 33 20 52 75 6e 20 | 45 64 69 66 66 20 6f 6e |@63 Run |Ediff on|
|00001520| 20 74 68 72 65 65 20 62 | 75 66 66 65 72 73 2c 20 | three b|uffers, |
|00001530| 42 55 46 46 45 52 2d 41 | 2c 20 42 55 46 46 45 52 |BUFFER-A|, BUFFER|
|00001540| 2d 42 2c 20 61 6e 64 20 | 42 55 46 46 45 52 2d 43 |-B, and |BUFFER-C|
|00001550| 2e 1f 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |...(defa|lias 'ed|
|00001560| 69 66 66 2d 62 75 66 66 | 65 72 73 33 20 23 5b 28 |iff-buff|ers3 #[(|
|00001570| 62 75 66 66 65 72 2d 41 | 20 62 75 66 66 65 72 2d |buffer-A| buffer-|
|00001580| 42 20 62 75 66 66 65 72 | 2d 43 20 26 6f 70 74 69 |B buffer|-C &opti|
|00001590| 6f 6e 61 6c 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |onal sta|rtup-hoo|
|000015a0| 6b 73 20 6a 6f 62 2d 6e | 61 6d 65 29 20 22 08 84 |ks job-n|ame) "..|
|000015b0| 06 00 c1 10 c2 0b 5c 66 | 0d 0e 06 08 25 87 22 20 |......\f|....%." |
|000015c0| 5b 6a 6f 62 2d 6e 61 6d | 65 20 65 64 69 66 66 2d |[job-nam|e ediff-|
|000015d0| 62 75 66 66 65 72 73 33 | 20 65 64 69 66 66 2d 62 |buffers3| ediff-b|
|000015e0| 75 66 66 65 72 73 2d 69 | 6e 74 65 72 6e 61 6c 20 |uffers-i|nternal |
|000015f0| 62 75 66 66 65 72 2d 41 | 20 62 75 66 66 65 72 2d |buffer-A| buffer-|
|00001600| 42 20 62 75 66 66 65 72 | 2d 43 20 73 74 61 72 74 |B buffer|-C start|
|00001610| 75 70 2d 68 6f 6f 6b 73 | 5d 20 36 20 28 23 24 20 |up-hooks|] 6 (#$ |
|00001620| 2e 20 35 33 39 36 29 20 | 28 6c 65 74 20 28 62 66 |. 5396) |(let (bf|
|00001630| 20 62 66 66 29 20 28 6c | 69 73 74 20 28 73 65 74 | bff) (l|ist (set|
|00001640| 71 20 62 66 20 28 72 65 | 61 64 2d 62 75 66 66 65 |q bf (re|ad-buffe|
|00001650| 72 20 22 42 75 66 66 65 | 72 20 41 20 74 6f 20 63 |r "Buffe|r A to c|
|00001660| 6f 6d 70 61 72 65 3a 20 | 22 20 28 65 64 69 66 66 |ompare: |" (ediff|
|00001670| 2d 6f 74 68 65 72 2d 62 | 75 66 66 65 72 20 22 22 |-other-b|uffer ""|
|00001680| 29 20 74 29 29 20 28 73 | 65 74 71 20 62 66 66 20 |) t)) (s|etq bff |
|00001690| 28 72 65 61 64 2d 62 75 | 66 66 65 72 20 22 42 75 |(read-bu|ffer "Bu|
|000016a0| 66 66 65 72 20 42 20 74 | 6f 20 63 6f 6d 70 61 72 |ffer B t|o compar|
|000016b0| 65 3a 20 22 20 28 70 72 | 6f 67 6e 20 28 73 61 76 |e: " (pr|ogn (sav|
|000016c0| 65 2d 77 69 6e 64 6f 77 | 2d 65 78 63 75 72 73 69 |e-window|-excursi|
|000016d0| 6f 6e 20 28 6f 74 68 65 | 72 2d 77 69 6e 64 6f 77 |on (othe|r-window|
|000016e0| 20 31 29 29 20 28 65 64 | 69 66 66 2d 6f 74 68 65 | 1)) (ed|iff-othe|
|000016f0| 72 2d 62 75 66 66 65 72 | 20 62 66 29 29 20 74 29 |r-buffer| bf)) t)|
|00001700| 29 20 28 72 65 61 64 2d | 62 75 66 66 65 72 20 22 |) (read-|buffer "|
|00001710| 42 75 66 66 65 72 20 43 | 20 74 6f 20 63 6f 6d 70 |Buffer C| to comp|
|00001720| 61 72 65 3a 20 22 20 28 | 70 72 6f 67 6e 20 28 73 |are: " (|progn (s|
|00001730| 61 76 65 2d 77 69 6e 64 | 6f 77 2d 65 78 63 75 72 |ave-wind|ow-excur|
|00001740| 73 69 6f 6e 20 28 6f 74 | 68 65 72 2d 77 69 6e 64 |sion (ot|her-wind|
|00001750| 6f 77 20 31 29 29 20 28 | 65 64 69 66 66 2d 6f 74 |ow 1)) (|ediff-ot|
|00001760| 68 65 72 2d 62 75 66 66 | 65 72 20 28 6c 69 73 74 |her-buff|er (list|
|00001770| 20 62 66 20 62 66 66 29 | 29 29 20 74 29 29 29 5d | bf bff)|)) t)))]|
|00001780| 29 0a 28 64 65 66 61 6c | 69 61 73 20 28 71 75 6f |).(defal|ias (quo|
|00001790| 74 65 20 65 62 75 66 66 | 65 72 73 33 29 20 28 71 |te ebuff|ers3) (q|
|000017a0| 75 6f 74 65 20 65 64 69 | 66 66 2d 62 75 66 66 65 |uote edi|ff-buffe|
|000017b0| 72 73 33 29 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |rs3)).(d|efalias |
|000017c0| 27 65 64 69 66 66 2d 62 | 75 66 66 65 72 73 2d 69 |'ediff-b|uffers-i|
|000017d0| 6e 74 65 72 6e 61 6c 20 | 23 5b 28 62 75 66 2d 41 |nternal |#[(buf-A|
|000017e0| 20 62 75 66 2d 42 20 62 | 75 66 2d 43 20 73 74 61 | buf-B b|uf-C sta|
|000017f0| 72 74 75 70 2d 68 6f 6f | 6b 73 20 6a 6f 62 2d 6e |rtup-hoo|ks job-n|
|00001800| 61 6d 65 29 20 22 c0 c1 | 5c 6e 21 21 1b c0 c1 5c |ame) "..|\n!!...\|
|00001810| 66 21 21 1d 0e 06 85 1e | 00 c1 0e 06 21 85 1e 00 |f!!.....|....!...|
|00001820| c7 c1 0e 06 21 21 89 1e | 08 85 29 00 c0 c1 5c 66 |....!!..|..)...\f|
|00001830| 21 21 1e 09 ca 1e 0b ca | 1e 5c 66 ca 1e 0d 5c 6e |!!......|.\f...\n|
|00001840| 83 46 00 c1 5c 6e 21 83 | 46 00 c7 c1 5c 6e 21 21 |.F..\n!.|F...\n!!|
|00001850| 84 4b 00 ce cf 5c 6e 5c | 22 88 5c 66 83 5d 00 c1 |.K...\n\|".\f.]..|
|00001860| 5c 66 21 83 5d 00 c7 c1 | 5c 66 21 21 84 62 00 ce |\f!.]...|\f!!.b..|
|00001870| cf 5c 66 5c 22 88 0e 10 | 1e 11 0e 12 83 76 00 0e |.\f\"...|.....v..|
|00001880| 08 84 76 00 ce cf 0e 06 | 5c 22 88 29 0b 3b 83 80 |..v.....|\".).;..|
|00001890| 00 d3 0b 21 13 0d 3b 83 | 89 00 d3 0d 21 15 0e 09 |...!..;.|....!...|
|000018a0| 3b 83 95 00 d3 0e 09 21 | 16 09 d4 5c 6e 0b 5c 22 |;......!|...\n.\"|
|000018b0| 16 0b d4 5c 66 0d 5c 22 | 16 5c 66 0e 08 83 ae 00 |...\f.\"|.\f.....|
|000018c0| d4 0e 06 0e 09 5c 22 16 | 0d d5 c1 5c 6e 21 0e 0b |.....\".|...\n!..|
|000018d0| c1 5c 66 21 0e 5c 66 0e | 08 85 c2 00 c1 0e 06 21 |.\f!.\f.|.......!|
|000018e0| 0e 0d d6 ca d7 0e 0b 44 | d7 0e 5c 66 44 d8 d9 0e |.......D|..\fD...|
|000018f0| 0d 44 d7 0e 0d 44 45 af | 05 0e 1a 42 d1 0e 10 42 |.D...DE.|...B...B|
|00001900| 43 26 08 2e 07 87 22 20 | 5b 62 75 66 66 65 72 2d |C&...." |[buffer-|
|00001910| 66 69 6c 65 2d 6e 61 6d | 65 20 67 65 74 2d 62 75 |file-nam|e get-bu|
|00001920| 66 66 65 72 20 62 75 66 | 2d 41 20 62 75 66 2d 41 |ffer buf|-A buf-A|
|00001930| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 62 75 66 2d 42 |-file-na|me buf-B|
|00001940| 20 62 75 66 2d 42 2d 66 | 69 6c 65 2d 6e 61 6d 65 | buf-B-f|ile-name|
|00001950| 20 62 75 66 2d 43 20 62 | 75 66 66 65 72 2d 6e 61 | buf-C b|uffer-na|
|00001960| 6d 65 20 62 75 66 2d 43 | 2d 69 73 2d 61 6c 69 76 |me buf-C|-is-aliv|
|00001970| 65 20 62 75 66 2d 43 2d | 66 69 6c 65 2d 6e 61 6d |e buf-C-|file-nam|
|00001980| 65 20 6e 69 6c 20 66 69 | 6c 65 2d 41 20 66 69 6c |e nil fi|le-A fil|
|00001990| 65 2d 42 20 66 69 6c 65 | 2d 43 20 65 72 72 6f 72 |e-B file|-C error|
|000019a0| 20 22 42 75 66 66 65 72 | 20 25 53 20 64 6f 65 73 | "Buffer| %S does|
|000019b0| 6e 27 74 20 65 78 69 73 | 74 22 20 6a 6f 62 2d 6e |n't exis|t" job-n|
|000019c0| 61 6d 65 20 65 64 69 66 | 66 2d 6a 6f 62 2d 6e 61 |ame edif|f-job-na|
|000019d0| 6d 65 20 65 64 69 66 66 | 2d 33 77 61 79 2d 63 6f |me ediff|-3way-co|
|000019e0| 6d 70 61 72 69 73 6f 6e | 2d 6a 6f 62 20 66 69 6c |mparison|-job fil|
|000019f0| 65 2d 6e 61 6d 65 2d 6e | 6f 6e 64 69 72 65 63 74 |e-name-n|ondirect|
|00001a00| 6f 72 79 20 65 64 69 66 | 66 2d 6d 61 6b 65 2d 74 |ory edif|f-make-t|
|00001a10| 65 6d 70 2d 66 69 6c 65 | 20 65 64 69 66 66 2d 73 |emp-file| ediff-s|
|00001a20| 65 74 75 70 20 6c 61 6d | 62 64 61 20 64 65 6c 65 |etup lam|bda dele|
|00001a30| 74 65 2d 66 69 6c 65 20 | 69 66 20 73 74 72 69 6e |te-file |if strin|
|00001a40| 67 70 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |gp start|up-hooks|
|00001a50| 5d 20 31 36 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |] 16]).(|defalias|
|00001a60| 20 27 65 64 69 66 66 2d | 67 65 74 2d 64 65 66 61 | 'ediff-|get-defa|
|00001a70| 75 6c 74 2d 64 69 72 65 | 63 74 6f 72 79 2d 6e 61 |ult-dire|ctory-na|
|00001a80| 6d 65 20 23 5b 6e 69 6c | 20 22 08 83 06 00 09 87 |me #[nil| "......|
|00001a90| 5c 6e c3 3d 83 27 00 c4 | c5 c6 5c 22 89 1e 07 3b |\n.=.'..|..\"...;|
|00001aa0| 83 23 00 c8 0e 07 21 83 | 23 00 0e 07 82 25 00 0e |.#....!.|#....%..|
|00001ab0| 09 29 87 0e 09 87 22 20 | 5b 65 64 69 66 66 2d 75 |.)...." |[ediff-u|
|00001ac0| 73 65 2d 6c 61 73 74 2d | 64 69 72 20 65 64 69 66 |se-last-|dir edif|
|00001ad0| 66 2d 6c 61 73 74 2d 64 | 69 72 2d 41 20 6d 61 6a |f-last-d|ir-A maj|
|00001ae0| 6f 72 2d 6d 6f 64 65 20 | 64 69 72 65 64 2d 6d 6f |or-mode |dired-mo|
|00001af0| 64 65 20 64 69 72 65 64 | 2d 67 65 74 2d 66 69 6c |de dired|-get-fil|
|00001b00| 65 6e 61 6d 65 20 6e 69 | 6c 20 6e 6f 65 72 72 6f |ename ni|l noerro|
|00001b10| 72 20 66 20 66 69 6c 65 | 2d 64 69 72 65 63 74 6f |r f file|-directo|
|00001b20| 72 79 2d 70 20 64 65 66 | 61 75 6c 74 2d 64 69 72 |ry-p def|ault-dir|
|00001b30| 65 63 74 6f 72 79 5d 20 | 34 5d 29 0a 23 40 32 30 |ectory] |4]).#@20|
|00001b40| 34 20 52 75 6e 20 45 64 | 69 66 66 20 6f 6e 20 61 |4 Run Ed|iff on a|
|00001b50| 20 70 61 69 72 20 6f 66 | 20 64 69 72 65 63 74 6f | pair of| directo|
|00001b60| 72 69 65 73 2c 20 44 49 | 52 31 20 61 6e 64 20 44 |ries, DI|R1 and D|
|00001b70| 49 52 32 2c 20 63 6f 6d | 70 61 72 69 6e 67 20 66 |IR2, com|paring f|
|00001b80| 69 6c 65 73 20 74 68 61 | 74 20 68 61 76 65 0a 74 |iles tha|t have.t|
|00001b90| 68 65 20 73 61 6d 65 20 | 6e 61 6d 65 20 69 6e 20 |he same |name in |
|00001ba0| 62 6f 74 68 2e 20 54 68 | 65 20 74 68 69 72 64 20 |both. Th|e third |
|00001bb0| 61 72 67 75 6d 65 6e 74 | 2c 20 52 45 47 45 58 50 |argument|, REGEXP|
|00001bc0| 2c 20 69 73 20 61 20 72 | 65 67 75 6c 61 72 20 65 |, is a r|egular e|
|00001bd0| 78 70 72 65 73 73 69 6f | 6e 20 74 68 61 74 0a 63 |xpressio|n that.c|
|00001be0| 61 6e 20 62 65 20 75 73 | 65 64 20 74 6f 20 66 69 |an be us|ed to fi|
|00001bf0| 6c 74 65 72 20 6f 75 74 | 20 63 65 72 74 61 69 6e |lter out| certain|
|00001c00| 20 66 69 6c 65 20 6e 61 | 6d 65 73 2e 1f 0a 28 64 | file na|mes...(d|
|00001c10| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 64 |efalias |'ediff-d|
|00001c20| 69 72 65 63 74 6f 72 69 | 65 73 20 23 5b 28 64 69 |irectori|es #[(di|
|00001c30| 72 31 20 64 69 72 32 20 | 72 65 67 65 78 70 29 20 |r1 dir2 |regexp) |
|00001c40| 22 c0 09 5c 6e c3 5c 66 | c5 c6 26 06 87 22 20 5b |"..\n.\f|..&.." [|
|00001c50| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 69 65 |ediff-di|rectorie|
|00001c60| 73 2d 69 6e 74 65 72 6e | 61 6c 20 64 69 72 31 20 |s-intern|al dir1 |
|00001c70| 64 69 72 32 20 6e 69 6c | 20 72 65 67 65 78 70 20 |dir2 nil| regexp |
|00001c80| 65 64 69 66 66 2d 66 69 | 6c 65 73 20 65 64 69 66 |ediff-fi|les edif|
|00001c90| 66 2d 64 69 72 65 63 74 | 6f 72 69 65 73 5d 20 37 |f-direct|ories] 7|
|00001ca0| 20 28 23 24 20 2e 20 36 | 39 37 38 29 20 28 6c 65 | (#$ . 6|978) (le|
|00001cb0| 74 20 28 28 64 69 72 2d | 41 20 28 65 64 69 66 66 |t ((dir-|A (ediff|
|00001cc0| 2d 67 65 74 2d 64 65 66 | 61 75 6c 74 2d 64 69 72 |-get-def|ault-dir|
|00001cd0| 65 63 74 6f 72 79 2d 6e | 61 6d 65 29 29 20 66 29 |ectory-n|ame)) f)|
|00001ce0| 20 28 6c 69 73 74 20 28 | 73 65 74 71 20 66 20 28 | (list (|setq f (|
|00001cf0| 65 64 69 66 66 2d 72 65 | 61 64 2d 66 69 6c 65 2d |ediff-re|ad-file-|
|00001d00| 6e 61 6d 65 20 22 44 69 | 72 65 63 74 6f 72 79 20 |name "Di|rectory |
|00001d10| 41 20 74 6f 20 63 6f 6d | 70 61 72 65 3a 22 20 64 |A to com|pare:" d|
|00001d20| 69 72 2d 41 20 6e 69 6c | 29 29 20 28 65 64 69 66 |ir-A nil|)) (edif|
|00001d30| 66 2d 72 65 61 64 2d 66 | 69 6c 65 2d 6e 61 6d 65 |f-read-f|ile-name|
|00001d40| 20 22 44 69 72 65 63 74 | 6f 72 79 20 42 20 74 6f | "Direct|ory B to|
|00001d50| 20 63 6f 6d 70 61 72 65 | 3a 22 20 28 69 66 20 65 | compare|:" (if e|
|00001d60| 64 69 66 66 2d 75 73 65 | 2d 6c 61 73 74 2d 64 69 |diff-use|-last-di|
|00001d70| 72 20 65 64 69 66 66 2d | 6c 61 73 74 2d 64 69 72 |r ediff-|last-dir|
|00001d80| 2d 42 20 28 65 64 69 66 | 66 2d 73 74 72 69 70 2d |-B (edif|f-strip-|
|00001d90| 6c 61 73 74 2d 64 69 72 | 20 66 29 29 20 6e 69 6c |last-dir| f)) nil|
|00001da0| 29 20 28 72 65 61 64 2d | 73 74 72 69 6e 67 20 22 |) (read-|string "|
|00001db0| 46 69 6c 74 65 72 20 74 | 68 72 6f 75 67 68 20 72 |Filter t|hrough r|
|00001dc0| 65 67 75 6c 61 72 20 65 | 78 70 72 65 73 73 69 6f |egular e|xpressio|
|00001dd0| 6e 3a 20 22 20 6e 69 6c | 20 28 71 75 6f 74 65 20 |n: " nil| (quote |
|00001de0| 65 64 69 66 66 2d 66 69 | 6c 74 65 72 69 6e 67 2d |ediff-fi|ltering-|
|00001df0| 72 65 67 65 78 70 2d 68 | 69 73 74 6f 72 79 29 29 |regexp-h|istory))|
|00001e00| 29 29 5d 29 0a 28 64 65 | 66 61 6c 69 61 73 20 28 |))]).(de|falias (|
|00001e10| 71 75 6f 74 65 20 65 64 | 69 72 73 29 20 28 71 75 |quote ed|irs) (qu|
|00001e20| 6f 74 65 20 65 64 69 66 | 66 2d 64 69 72 65 63 74 |ote edif|f-direct|
|00001e30| 6f 72 69 65 73 29 29 0a | 23 40 32 32 38 20 52 75 |ories)).|#@228 Ru|
|00001e40| 6e 20 45 64 69 66 66 20 | 6f 6e 20 61 20 64 69 72 |n Ediff |on a dir|
|00001e50| 65 63 74 6f 72 79 2c 20 | 44 49 52 31 2c 20 63 6f |ectory, |DIR1, co|
|00001e60| 6d 70 61 72 69 6e 67 20 | 69 74 73 20 66 69 6c 65 |mparing |its file|
|00001e70| 73 20 77 69 74 68 20 74 | 68 65 69 72 20 72 65 76 |s with t|heir rev|
|00001e80| 69 73 69 6f 6e 73 2e 0a | 54 68 65 20 73 65 63 6f |isions..|The seco|
|00001e90| 6e 64 20 61 72 67 75 6d | 65 6e 74 2c 20 52 45 47 |nd argum|ent, REG|
|00001ea0| 45 58 50 2c 20 69 73 20 | 61 20 72 65 67 75 6c 61 |EXP, is |a regula|
|00001eb0| 72 20 65 78 70 72 65 73 | 73 69 6f 6e 20 74 68 61 |r expres|sion tha|
|00001ec0| 74 20 66 69 6c 74 65 72 | 73 20 74 68 65 20 66 69 |t filter|s the fi|
|00001ed0| 6c 65 0a 6e 61 6d 65 73 | 2e 20 4f 6e 6c 79 20 74 |le.names|. Only t|
|00001ee0| 68 65 20 66 69 6c 65 73 | 20 74 68 61 74 20 61 72 |he files| that ar|
|00001ef0| 65 20 75 6e 64 65 72 20 | 72 65 76 69 73 69 6f 6e |e under |revision|
|00001f00| 20 63 6f 6e 74 72 6f 6c | 20 61 72 65 20 74 61 6b | control| are tak|
|00001f10| 65 6e 20 69 6e 74 6f 20 | 61 63 63 6f 75 6e 74 2e |en into |account.|
|00001f20| 1f 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |..(defal|ias 'edi|
|00001f30| 66 66 2d 64 69 72 65 63 | 74 6f 72 79 2d 72 65 76 |ff-direc|tory-rev|
|00001f40| 69 73 69 6f 6e 73 20 23 | 5b 28 64 69 72 31 20 72 |isions #|[(dir1 r|
|00001f50| 65 67 65 78 70 29 20 22 | c0 09 5c 6e c3 c4 24 87 |egexp) "|..\n..$.|
|00001f60| 22 20 5b 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f |" [ediff|-directo|
|00001f70| 72 79 2d 72 65 76 69 73 | 69 6f 6e 73 2d 69 6e 74 |ry-revis|ions-int|
|00001f80| 65 72 6e 61 6c 20 64 69 | 72 31 20 72 65 67 65 78 |ernal di|r1 regex|
|00001f90| 70 20 65 64 69 66 66 2d | 72 65 76 69 73 69 6f 6e |p ediff-|revision|
|00001fa0| 20 65 64 69 66 66 2d 64 | 69 72 65 63 74 6f 72 79 | ediff-d|irectory|
|00001fb0| 2d 72 65 76 69 73 69 6f | 6e 73 5d 20 35 20 28 23 |-revisio|ns] 5 (#|
|00001fc0| 24 20 2e 20 37 37 34 32 | 29 20 28 6c 65 74 20 28 |$ . 7742|) (let (|
|00001fd0| 28 64 69 72 2d 41 20 28 | 65 64 69 66 66 2d 67 65 |(dir-A (|ediff-ge|
|00001fe0| 74 2d 64 65 66 61 75 6c | 74 2d 64 69 72 65 63 74 |t-defaul|t-direct|
|00001ff0| 6f 72 79 2d 6e 61 6d 65 | 29 29 29 20 28 6c 69 73 |ory-name|))) (lis|
|00002000| 74 20 28 65 64 69 66 66 | 2d 72 65 61 64 2d 66 69 |t (ediff|-read-fi|
|00002010| 6c 65 2d 6e 61 6d 65 20 | 22 44 69 72 65 63 74 6f |le-name |"Directo|
|00002020| 72 79 20 74 6f 20 63 6f | 6d 70 61 72 65 20 77 69 |ry to co|mpare wi|
|00002030| 74 68 20 72 65 76 69 73 | 69 6f 6e 3a 22 20 64 69 |th revis|ion:" di|
|00002040| 72 2d 41 20 6e 69 6c 29 | 20 28 72 65 61 64 2d 73 |r-A nil)| (read-s|
|00002050| 74 72 69 6e 67 20 22 46 | 69 6c 74 65 72 20 74 68 |tring "F|ilter th|
|00002060| 72 6f 75 67 68 20 72 65 | 67 75 6c 61 72 20 65 78 |rough re|gular ex|
|00002070| 70 72 65 73 73 69 6f 6e | 3a 20 22 20 6e 69 6c 20 |pression|: " nil |
|00002080| 28 71 75 6f 74 65 20 65 | 64 69 66 66 2d 66 69 6c |(quote e|diff-fil|
|00002090| 74 65 72 69 6e 67 2d 72 | 65 67 65 78 70 2d 68 69 |tering-r|egexp-hi|
|000020a0| 73 74 6f 72 79 29 29 29 | 29 5d 29 0a 28 64 65 66 |story)))|)]).(def|
|000020b0| 61 6c 69 61 73 20 28 71 | 75 6f 74 65 20 65 64 69 |alias (q|uote edi|
|000020c0| 72 2d 72 65 76 69 73 69 | 6f 6e 73 29 20 28 71 75 |r-revisi|ons) (qu|
|000020d0| 6f 74 65 20 65 64 69 66 | 66 2d 64 69 72 65 63 74 |ote edif|f-direct|
|000020e0| 6f 72 79 2d 72 65 76 69 | 73 69 6f 6e 73 29 29 0a |ory-revi|sions)).|
|000020f0| 23 40 32 31 31 20 52 75 | 6e 20 45 64 69 66 66 20 |#@211 Ru|n Ediff |
|00002100| 6f 6e 20 74 68 72 65 65 | 20 64 69 72 65 63 74 6f |on three| directo|
|00002110| 72 69 65 73 2c 20 44 49 | 52 31 2c 20 44 49 52 32 |ries, DI|R1, DIR2|
|00002120| 2c 20 61 6e 64 20 44 49 | 52 33 2c 20 63 6f 6d 70 |, and DI|R3, comp|
|00002130| 61 72 69 6e 67 20 66 69 | 6c 65 73 20 74 68 61 74 |aring fi|les that|
|00002140| 0a 68 61 76 65 20 74 68 | 65 20 73 61 6d 65 20 6e |.have th|e same n|
|00002150| 61 6d 65 20 69 6e 20 61 | 6c 6c 20 74 68 72 65 65 |ame in a|ll three|
|00002160| 2e 20 54 68 65 20 6c 61 | 73 74 20 61 72 67 75 6d |. The la|st argum|
|00002170| 65 6e 74 2c 20 52 45 47 | 45 58 50 2c 20 69 73 20 |ent, REG|EXP, is |
|00002180| 61 20 72 65 67 75 6c 61 | 72 0a 65 78 70 72 65 73 |a regula|r.expres|
|00002190| 73 69 6f 6e 20 74 68 61 | 74 20 63 61 6e 20 62 65 |sion tha|t can be|
|000021a0| 20 75 73 65 64 20 74 6f | 20 66 69 6c 74 65 72 20 | used to| filter |
|000021b0| 6f 75 74 20 63 65 72 74 | 61 69 6e 20 66 69 6c 65 |out cert|ain file|
|000021c0| 20 6e 61 6d 65 73 2e 1f | 0a 28 64 65 66 61 6c 69 | names..|.(defali|
|000021d0| 61 73 20 27 65 64 69 66 | 66 2d 64 69 72 65 63 74 |as 'edif|f-direct|
|000021e0| 6f 72 69 65 73 33 20 23 | 5b 28 64 69 72 31 20 64 |ories3 #|[(dir1 d|
|000021f0| 69 72 32 20 64 69 72 33 | 20 72 65 67 65 78 70 29 |ir2 dir3| regexp)|
|00002200| 20 22 c0 09 5c 6e 0b 5c | 66 c5 c6 26 06 87 22 20 | "..\n.\|f..&.." |
|00002210| 5b 65 64 69 66 66 2d 64 | 69 72 65 63 74 6f 72 69 |[ediff-d|irectori|
|00002220| 65 73 2d 69 6e 74 65 72 | 6e 61 6c 20 64 69 72 31 |es-inter|nal dir1|
|00002230| 20 64 69 72 32 20 64 69 | 72 33 20 72 65 67 65 78 | dir2 di|r3 regex|
|00002240| 70 20 65 64 69 66 66 2d | 66 69 6c 65 73 33 20 65 |p ediff-|files3 e|
|00002250| 64 69 66 66 2d 64 69 72 | 65 63 74 6f 72 69 65 73 |diff-dir|ectories|
|00002260| 33 5d 20 37 20 28 23 24 | 20 2e 20 38 34 33 38 29 |3] 7 (#$| . 8438)|
|00002270| 20 28 6c 65 74 20 28 28 | 64 69 72 2d 41 20 28 65 | (let ((|dir-A (e|
|00002280| 64 69 66 66 2d 67 65 74 | 2d 64 65 66 61 75 6c 74 |diff-get|-default|
|00002290| 2d 64 69 72 65 63 74 6f | 72 79 2d 6e 61 6d 65 29 |-directo|ry-name)|
|000022a0| 29 20 66 29 20 28 6c 69 | 73 74 20 28 73 65 74 71 |) f) (li|st (setq|
|000022b0| 20 66 20 28 65 64 69 66 | 66 2d 72 65 61 64 2d 66 | f (edif|f-read-f|
|000022c0| 69 6c 65 2d 6e 61 6d 65 | 20 22 44 69 72 65 63 74 |ile-name| "Direct|
|000022d0| 6f 72 79 20 41 20 74 6f | 20 63 6f 6d 70 61 72 65 |ory A to| compare|
|000022e0| 3a 22 20 64 69 72 2d 41 | 20 6e 69 6c 29 29 20 28 |:" dir-A| nil)) (|
|000022f0| 73 65 74 71 20 66 20 28 | 65 64 69 66 66 2d 72 65 |setq f (|ediff-re|
|00002300| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 44 69 |ad-file-|name "Di|
|00002310| 72 65 63 74 6f 72 79 20 | 42 20 74 6f 20 63 6f 6d |rectory |B to com|
|00002320| 70 61 72 65 3a 22 20 28 | 69 66 20 65 64 69 66 66 |pare:" (|if ediff|
|00002330| 2d 75 73 65 2d 6c 61 73 | 74 2d 64 69 72 20 65 64 |-use-las|t-dir ed|
|00002340| 69 66 66 2d 6c 61 73 74 | 2d 64 69 72 2d 42 20 28 |iff-last|-dir-B (|
|00002350| 65 64 69 66 66 2d 73 74 | 72 69 70 2d 6c 61 73 74 |ediff-st|rip-last|
|00002360| 2d 64 69 72 20 66 29 29 | 20 6e 69 6c 29 29 20 28 |-dir f))| nil)) (|
|00002370| 65 64 69 66 66 2d 72 65 | 61 64 2d 66 69 6c 65 2d |ediff-re|ad-file-|
|00002380| 6e 61 6d 65 20 22 44 69 | 72 65 63 74 6f 72 79 20 |name "Di|rectory |
|00002390| 43 20 74 6f 20 63 6f 6d | 70 61 72 65 3a 22 20 28 |C to com|pare:" (|
|000023a0| 69 66 20 65 64 69 66 66 | 2d 75 73 65 2d 6c 61 73 |if ediff|-use-las|
|000023b0| 74 2d 64 69 72 20 65 64 | 69 66 66 2d 6c 61 73 74 |t-dir ed|iff-last|
|000023c0| 2d 64 69 72 2d 43 20 28 | 65 64 69 66 66 2d 73 74 |-dir-C (|ediff-st|
|000023d0| 72 69 70 2d 6c 61 73 74 | 2d 64 69 72 20 66 29 29 |rip-last|-dir f))|
|000023e0| 20 6e 69 6c 29 20 28 72 | 65 61 64 2d 73 74 72 69 | nil) (r|ead-stri|
|000023f0| 6e 67 20 22 46 69 6c 74 | 65 72 20 74 68 72 6f 75 |ng "Filt|er throu|
|00002400| 67 68 20 72 65 67 75 6c | 61 72 20 65 78 70 72 65 |gh regul|ar expre|
|00002410| 73 73 69 6f 6e 3a 20 22 | 20 6e 69 6c 20 28 71 75 |ssion: "| nil (qu|
|00002420| 6f 74 65 20 65 64 69 66 | 66 2d 66 69 6c 74 65 72 |ote edif|f-filter|
|00002430| 69 6e 67 2d 72 65 67 65 | 78 70 2d 68 69 73 74 6f |ing-rege|xp-histo|
|00002440| 72 79 29 29 29 29 5d 29 | 0a 28 64 65 66 61 6c 69 |ry))))])|.(defali|
|00002450| 61 73 20 28 71 75 6f 74 | 65 20 65 64 69 72 73 33 |as (quot|e edirs3|
|00002460| 29 20 28 71 75 6f 74 65 | 20 65 64 69 66 66 2d 64 |) (quote| ediff-d|
|00002470| 69 72 65 63 74 6f 72 69 | 65 73 33 29 29 0a 23 40 |irectori|es3)).#@|
|00002480| 32 30 32 20 52 75 6e 20 | 45 64 69 66 66 20 6f 6e |202 Run |Ediff on|
|00002490| 20 61 20 70 61 69 72 20 | 6f 66 20 64 69 72 65 63 | a pair |of direc|
|000024a0| 74 6f 72 69 65 73 2c 20 | 44 49 52 31 20 61 6e 64 |tories, |DIR1 and|
|000024b0| 20 44 49 52 32 2c 20 6d | 65 72 67 69 6e 67 20 66 | DIR2, m|erging f|
|000024c0| 69 6c 65 73 20 74 68 61 | 74 20 68 61 76 65 0a 74 |iles tha|t have.t|
|000024d0| 68 65 20 73 61 6d 65 20 | 6e 61 6d 65 20 69 6e 20 |he same |name in |
|000024e0| 62 6f 74 68 2e 20 54 68 | 65 20 74 68 69 72 64 20 |both. Th|e third |
|000024f0| 61 72 67 75 6d 65 6e 74 | 2c 20 52 45 47 45 58 50 |argument|, REGEXP|
|00002500| 2c 20 69 73 20 61 20 72 | 65 67 75 6c 61 72 20 65 |, is a r|egular e|
|00002510| 78 70 72 65 73 73 69 6f | 6e 20 74 68 61 74 0a 63 |xpressio|n that.c|
|00002520| 61 6e 20 62 65 20 75 73 | 65 64 20 74 6f 20 66 69 |an be us|ed to fi|
|00002530| 6c 74 65 72 20 6f 75 74 | 20 63 65 72 74 61 69 6e |lter out| certain|
|00002540| 20 66 69 6c 65 20 6e 61 | 6d 65 73 2e 1f 0a 28 64 | file na|mes...(d|
|00002550| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 6d |efalias |'ediff-m|
|00002560| 65 72 67 65 2d 64 69 72 | 65 63 74 6f 72 69 65 73 |erge-dir|ectories|
|00002570| 20 23 5b 28 64 69 72 31 | 20 64 69 72 32 20 72 65 | #[(dir1| dir2 re|
|00002580| 67 65 78 70 29 20 22 c0 | 09 5c 6e c3 5c 66 c5 c6 |gexp) ".|.\n.\f..|
|00002590| 26 06 87 22 20 5b 65 64 | 69 66 66 2d 64 69 72 65 |&.." [ed|iff-dire|
|000025a0| 63 74 6f 72 69 65 73 2d | 69 6e 74 65 72 6e 61 6c |ctories-|internal|
|000025b0| 20 64 69 72 31 20 64 69 | 72 32 20 6e 69 6c 20 72 | dir1 di|r2 nil r|
|000025c0| 65 67 65 78 70 20 65 64 | 69 66 66 2d 6d 65 72 67 |egexp ed|iff-merg|
|000025d0| 65 2d 66 69 6c 65 73 20 | 65 64 69 66 66 2d 6d 65 |e-files |ediff-me|
|000025e0| 72 67 65 2d 64 69 72 65 | 63 74 6f 72 69 65 73 5d |rge-dire|ctories]|
|000025f0| 20 37 20 28 23 24 20 2e | 20 39 33 34 38 29 20 28 | 7 (#$ .| 9348) (|
|00002600| 6c 65 74 20 28 28 64 69 | 72 2d 41 20 28 65 64 69 |let ((di|r-A (edi|
|00002610| 66 66 2d 67 65 74 2d 64 | 65 66 61 75 6c 74 2d 64 |ff-get-d|efault-d|
|00002620| 69 72 65 63 74 6f 72 79 | 2d 6e 61 6d 65 29 29 20 |irectory|-name)) |
|00002630| 66 29 20 28 6c 69 73 74 | 20 28 73 65 74 71 20 66 |f) (list| (setq f|
|00002640| 20 28 65 64 69 66 66 2d | 72 65 61 64 2d 66 69 6c | (ediff-|read-fil|
|00002650| 65 2d 6e 61 6d 65 20 22 | 44 69 72 65 63 74 6f 72 |e-name "|Director|
|00002660| 79 20 41 20 74 6f 20 6d | 65 72 67 65 3a 22 20 64 |y A to m|erge:" d|
|00002670| 69 72 2d 41 20 6e 69 6c | 29 29 20 28 65 64 69 66 |ir-A nil|)) (edif|
|00002680| 66 2d 72 65 61 64 2d 66 | 69 6c 65 2d 6e 61 6d 65 |f-read-f|ile-name|
|00002690| 20 22 44 69 72 65 63 74 | 6f 72 79 20 42 20 74 6f | "Direct|ory B to|
|000026a0| 20 6d 65 72 67 65 3a 22 | 20 28 69 66 20 65 64 69 | merge:"| (if edi|
|000026b0| 66 66 2d 75 73 65 2d 6c | 61 73 74 2d 64 69 72 20 |ff-use-l|ast-dir |
|000026c0| 65 64 69 66 66 2d 6c 61 | 73 74 2d 64 69 72 2d 42 |ediff-la|st-dir-B|
|000026d0| 20 28 65 64 69 66 66 2d | 73 74 72 69 70 2d 6c 61 | (ediff-|strip-la|
|000026e0| 73 74 2d 64 69 72 20 66 | 29 29 20 6e 69 6c 29 20 |st-dir f|)) nil) |
|000026f0| 28 72 65 61 64 2d 73 74 | 72 69 6e 67 20 22 46 69 |(read-st|ring "Fi|
|00002700| 6c 74 65 72 20 74 68 72 | 6f 75 67 68 20 72 65 67 |lter thr|ough reg|
|00002710| 75 6c 61 72 20 65 78 70 | 72 65 73 73 69 6f 6e 3a |ular exp|ression:|
|00002720| 20 22 20 6e 69 6c 20 28 | 71 75 6f 74 65 20 65 64 | " nil (|quote ed|
|00002730| 69 66 66 2d 66 69 6c 74 | 65 72 69 6e 67 2d 72 65 |iff-filt|ering-re|
|00002740| 67 65 78 70 2d 68 69 73 | 74 6f 72 79 29 29 29 29 |gexp-his|tory))))|
|00002750| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 28 71 75 |]).(defa|lias (qu|
|00002760| 6f 74 65 20 65 64 69 72 | 73 2d 6d 65 72 67 65 29 |ote edir|s-merge)|
|00002770| 20 28 71 75 6f 74 65 20 | 65 64 69 66 66 2d 6d 65 | (quote |ediff-me|
|00002780| 72 67 65 2d 64 69 72 65 | 63 74 6f 72 69 65 73 29 |rge-dire|ctories)|
|00002790| 29 0a 23 40 33 36 31 20 | 4d 65 72 67 65 20 66 69 |).#@361 |Merge fi|
|000027a0| 6c 65 73 20 69 6e 20 64 | 69 72 65 63 74 6f 72 69 |les in d|irectori|
|000027b0| 65 73 20 44 49 52 31 20 | 61 6e 64 20 44 49 52 32 |es DIR1 |and DIR2|
|000027c0| 20 75 73 69 6e 67 20 66 | 69 6c 65 73 20 69 6e 20 | using f|iles in |
|000027d0| 41 4e 43 45 53 54 4f 52 | 2d 44 49 52 20 61 73 20 |ANCESTOR|-DIR as |
|000027e0| 61 6e 63 65 73 74 6f 72 | 73 2e 0a 45 64 69 66 66 |ancestor|s..Ediff|
|000027f0| 20 6d 65 72 67 65 73 20 | 66 69 6c 65 73 20 74 68 | merges |files th|
|00002800| 61 74 20 68 61 76 65 20 | 69 64 65 6e 74 69 63 61 |at have |identica|
|00002810| 6c 20 6e 61 6d 65 73 20 | 69 6e 20 44 49 52 31 2c |l names |in DIR1,|
|00002820| 20 44 49 52 32 2e 20 49 | 66 20 61 20 70 61 69 72 | DIR2. I|f a pair|
|00002830| 20 6f 66 20 66 69 6c 65 | 73 0a 69 6e 20 44 49 52 | of file|s.in DIR|
|00002840| 31 20 61 6e 64 20 44 49 | 52 32 20 64 6f 65 73 6e |1 and DI|R2 doesn|
|00002850| 27 74 20 68 61 76 65 20 | 61 6e 20 61 6e 63 65 73 |'t have |an ances|
|00002860| 74 6f 72 20 69 6e 20 41 | 4e 43 45 53 54 4f 52 2d |tor in A|NCESTOR-|
|00002870| 44 49 52 2c 20 45 64 69 | 66 66 20 77 69 6c 6c 20 |DIR, Edi|ff will |
|00002880| 6d 65 72 67 65 0a 77 69 | 74 68 6f 75 74 20 61 6e |merge.wi|thout an|
|00002890| 63 65 73 74 6f 72 2e 20 | 54 68 65 20 66 6f 75 72 |cestor. |The four|
|000028a0| 74 68 20 61 72 67 75 6d | 65 6e 74 2c 20 52 45 47 |th argum|ent, REG|
|000028b0| 45 58 50 2c 20 69 73 20 | 61 20 72 65 67 75 6c 61 |EXP, is |a regula|
|000028c0| 72 20 65 78 70 72 65 73 | 73 69 6f 6e 20 74 68 61 |r expres|sion tha|
|000028d0| 74 0a 63 61 6e 20 62 65 | 20 75 73 65 64 20 74 6f |t.can be| used to|
|000028e0| 20 66 69 6c 74 65 72 20 | 6f 75 74 20 63 65 72 74 | filter |out cert|
|000028f0| 61 69 6e 20 66 69 6c 65 | 20 6e 61 6d 65 73 2e 1f |ain file| names..|
|00002900| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00002910| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|00002920| 69 65 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ies-with|-ancesto|
|00002930| 72 20 23 5b 28 64 69 72 | 31 20 64 69 72 32 20 61 |r #[(dir|1 dir2 a|
|00002940| 6e 63 65 73 74 6f 72 2d | 64 69 72 20 72 65 67 65 |ncestor-|dir rege|
|00002950| 78 70 29 20 22 c0 09 5c | 6e 0b 5c 66 c5 c6 26 06 |xp) "..\|n.\f..&.|
|00002960| 87 22 20 5b 65 64 69 66 | 66 2d 64 69 72 65 63 74 |." [edif|f-direct|
|00002970| 6f 72 69 65 73 2d 69 6e | 74 65 72 6e 61 6c 20 64 |ories-in|ternal d|
|00002980| 69 72 31 20 64 69 72 32 | 20 61 6e 63 65 73 74 6f |ir1 dir2| ancesto|
|00002990| 72 2d 64 69 72 20 72 65 | 67 65 78 70 20 65 64 69 |r-dir re|gexp edi|
|000029a0| 66 66 2d 6d 65 72 67 65 | 2d 66 69 6c 65 73 2d 77 |ff-merge|-files-w|
|000029b0| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 20 65 64 69 |ith-ance|stor edi|
|000029c0| 66 66 2d 6d 65 72 67 65 | 2d 64 69 72 65 63 74 6f |ff-merge|-directo|
|000029d0| 72 69 65 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |ries-wit|h-ancest|
|000029e0| 6f 72 5d 20 37 20 28 23 | 24 20 2e 20 31 30 31 33 |or] 7 (#|$ . 1013|
|000029f0| 36 29 20 28 6c 65 74 20 | 28 28 64 69 72 2d 41 20 |6) (let |((dir-A |
|00002a00| 28 65 64 69 66 66 2d 67 | 65 74 2d 64 65 66 61 75 |(ediff-g|et-defau|
|00002a10| 6c 74 2d 64 69 72 65 63 | 74 6f 72 79 2d 6e 61 6d |lt-direc|tory-nam|
|00002a20| 65 29 29 20 66 29 20 28 | 6c 69 73 74 20 28 73 65 |e)) f) (|list (se|
|00002a30| 74 71 20 66 20 28 65 64 | 69 66 66 2d 72 65 61 64 |tq f (ed|iff-read|
|00002a40| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 22 44 69 72 65 |-file-na|me "Dire|
|00002a50| 63 74 6f 72 79 20 41 20 | 74 6f 20 6d 65 72 67 65 |ctory A |to merge|
|00002a60| 3a 22 20 64 69 72 2d 41 | 20 6e 69 6c 29 29 20 28 |:" dir-A| nil)) (|
|00002a70| 73 65 74 71 20 66 20 28 | 65 64 69 66 66 2d 72 65 |setq f (|ediff-re|
|00002a80| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 44 69 |ad-file-|name "Di|
|00002a90| 72 65 63 74 6f 72 79 20 | 42 20 74 6f 20 6d 65 72 |rectory |B to mer|
|00002aa0| 67 65 3a 22 20 28 69 66 | 20 65 64 69 66 66 2d 75 |ge:" (if| ediff-u|
|00002ab0| 73 65 2d 6c 61 73 74 2d | 64 69 72 20 65 64 69 66 |se-last-|dir edif|
|00002ac0| 66 2d 6c 61 73 74 2d 64 | 69 72 2d 42 20 28 65 64 |f-last-d|ir-B (ed|
|00002ad0| 69 66 66 2d 73 74 72 69 | 70 2d 6c 61 73 74 2d 64 |iff-stri|p-last-d|
|00002ae0| 69 72 20 66 29 29 20 6e | 69 6c 29 29 20 28 65 64 |ir f)) n|il)) (ed|
|00002af0| 69 66 66 2d 72 65 61 64 | 2d 66 69 6c 65 2d 6e 61 |iff-read|-file-na|
|00002b00| 6d 65 20 22 41 6e 63 65 | 73 74 6f 72 20 64 69 72 |me "Ance|stor dir|
|00002b10| 65 63 74 6f 72 79 3a 22 | 20 28 69 66 20 65 64 69 |ectory:"| (if edi|
|00002b20| 66 66 2d 75 73 65 2d 6c | 61 73 74 2d 64 69 72 20 |ff-use-l|ast-dir |
|00002b30| 65 64 69 66 66 2d 6c 61 | 73 74 2d 64 69 72 2d 43 |ediff-la|st-dir-C|
|00002b40| 20 28 65 64 69 66 66 2d | 73 74 72 69 70 2d 6c 61 | (ediff-|strip-la|
|00002b50| 73 74 2d 64 69 72 20 66 | 29 29 20 6e 69 6c 29 20 |st-dir f|)) nil) |
|00002b60| 28 72 65 61 64 2d 73 74 | 72 69 6e 67 20 22 46 69 |(read-st|ring "Fi|
|00002b70| 6c 74 65 72 20 74 68 72 | 6f 75 67 68 20 72 65 67 |lter thr|ough reg|
|00002b80| 75 6c 61 72 20 65 78 70 | 72 65 73 73 69 6f 6e 3a |ular exp|ression:|
|00002b90| 20 22 20 6e 69 6c 20 28 | 71 75 6f 74 65 20 65 64 | " nil (|quote ed|
|00002ba0| 69 66 66 2d 66 69 6c 74 | 65 72 69 6e 67 2d 72 65 |iff-filt|ering-re|
|00002bb0| 67 65 78 70 2d 68 69 73 | 74 6f 72 79 29 29 29 29 |gexp-his|tory))))|
|00002bc0| 5d 29 0a 23 40 32 32 36 | 20 52 75 6e 20 45 64 69 |]).#@226| Run Edi|
|00002bd0| 66 66 20 6f 6e 20 61 20 | 64 69 72 65 63 74 6f 72 |ff on a |director|
|00002be0| 79 2c 20 44 49 52 31 2c | 20 6d 65 72 67 69 6e 67 |y, DIR1,| merging|
|00002bf0| 20 69 74 73 20 66 69 6c | 65 73 20 77 69 74 68 20 | its fil|es with |
|00002c00| 74 68 65 69 72 20 72 65 | 76 69 73 69 6f 6e 73 2e |their re|visions.|
|00002c10| 0a 54 68 65 20 73 65 63 | 6f 6e 64 20 61 72 67 75 |.The sec|ond argu|
|00002c20| 6d 65 6e 74 2c 20 52 45 | 47 45 58 50 2c 20 69 73 |ment, RE|GEXP, is|
|00002c30| 20 61 20 72 65 67 75 6c | 61 72 20 65 78 70 72 65 | a regul|ar expre|
|00002c40| 73 73 69 6f 6e 20 74 68 | 61 74 20 66 69 6c 74 65 |ssion th|at filte|
|00002c50| 72 73 20 74 68 65 20 66 | 69 6c 65 0a 6e 61 6d 65 |rs the f|ile.name|
|00002c60| 73 2e 20 4f 6e 6c 79 20 | 74 68 65 20 66 69 6c 65 |s. Only |the file|
|00002c70| 73 20 74 68 61 74 20 61 | 72 65 20 75 6e 64 65 72 |s that a|re under|
|00002c80| 20 72 65 76 69 73 69 6f | 6e 20 63 6f 6e 74 72 6f | revisio|n contro|
|00002c90| 6c 20 61 72 65 20 74 61 | 6b 65 6e 20 69 6e 74 6f |l are ta|ken into|
|00002ca0| 20 61 63 63 6f 75 6e 74 | 2e 1f 0a 28 64 65 66 61 | account|...(defa|
|00002cb0| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 6d 65 72 67 |lias 'ed|iff-merg|
|00002cc0| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 72 65 76 69 |e-direct|ory-revi|
|00002cd0| 73 69 6f 6e 73 20 23 5b | 28 64 69 72 31 20 72 65 |sions #[|(dir1 re|
|00002ce0| 67 65 78 70 29 20 22 c0 | 09 5c 6e c3 c4 24 87 22 |gexp) ".|.\n..$."|
|00002cf0| 20 5b 65 64 69 66 66 2d | 64 69 72 65 63 74 6f 72 | [ediff-|director|
|00002d00| 79 2d 72 65 76 69 73 69 | 6f 6e 73 2d 69 6e 74 65 |y-revisi|ons-inte|
|00002d10| 72 6e 61 6c 20 64 69 72 | 31 20 72 65 67 65 78 70 |rnal dir|1 regexp|
|00002d20| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 72 65 76 | ediff-m|erge-rev|
|00002d30| 69 73 69 6f 6e 73 20 65 | 64 69 66 66 2d 6d 65 72 |isions e|diff-mer|
|00002d40| 67 65 2d 64 69 72 65 63 | 74 6f 72 79 2d 72 65 76 |ge-direc|tory-rev|
|00002d50| 69 73 69 6f 6e 73 5d 20 | 35 20 28 23 24 20 2e 20 |isions] |5 (#$ . |
|00002d60| 31 31 32 30 39 29 20 28 | 6c 65 74 20 28 28 64 69 |11209) (|let ((di|
|00002d70| 72 2d 41 20 28 65 64 69 | 66 66 2d 67 65 74 2d 64 |r-A (edi|ff-get-d|
|00002d80| 65 66 61 75 6c 74 2d 64 | 69 72 65 63 74 6f 72 79 |efault-d|irectory|
|00002d90| 2d 6e 61 6d 65 29 29 29 | 20 28 6c 69 73 74 20 28 |-name)))| (list (|
|00002da0| 65 64 69 66 66 2d 72 65 | 61 64 2d 66 69 6c 65 2d |ediff-re|ad-file-|
|00002db0| 6e 61 6d 65 20 22 44 69 | 72 65 63 74 6f 72 79 20 |name "Di|rectory |
|00002dc0| 74 6f 20 6d 65 72 67 65 | 20 77 69 74 68 20 72 65 |to merge| with re|
|00002dd0| 76 69 73 69 6f 6e 73 3a | 22 20 64 69 72 2d 41 20 |visions:|" dir-A |
|00002de0| 6e 69 6c 29 20 28 72 65 | 61 64 2d 73 74 72 69 6e |nil) (re|ad-strin|
|00002df0| 67 20 22 46 69 6c 74 65 | 72 20 74 68 72 6f 75 67 |g "Filte|r throug|
|00002e00| 68 20 72 65 67 75 6c 61 | 72 20 65 78 70 72 65 73 |h regula|r expres|
|00002e10| 73 69 6f 6e 3a 20 22 20 | 6e 69 6c 20 28 71 75 6f |sion: " |nil (quo|
|00002e20| 74 65 20 65 64 69 66 66 | 2d 66 69 6c 74 65 72 69 |te ediff|-filteri|
|00002e30| 6e 67 2d 72 65 67 65 78 | 70 2d 68 69 73 74 6f 72 |ng-regex|p-histor|
|00002e40| 79 29 29 29 29 5d 29 0a | 28 64 65 66 61 6c 69 61 |y))))]).|(defalia|
|00002e50| 73 20 28 71 75 6f 74 65 | 20 65 64 69 72 2d 6d 65 |s (quote| edir-me|
|00002e60| 72 67 65 2d 72 65 76 69 | 73 69 6f 6e 73 29 20 28 |rge-revi|sions) (|
|00002e70| 71 75 6f 74 65 20 65 64 | 69 66 66 2d 6d 65 72 67 |quote ed|iff-merg|
|00002e80| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 72 65 76 69 |e-direct|ory-revi|
|00002e90| 73 69 6f 6e 73 29 29 0a | 23 40 32 34 30 20 52 75 |sions)).|#@240 Ru|
|00002ea0| 6e 20 45 64 69 66 66 20 | 6f 6e 20 61 20 64 69 72 |n Ediff |on a dir|
|00002eb0| 65 63 74 6f 72 79 2c 20 | 44 49 52 31 2c 20 6d 65 |ectory, |DIR1, me|
|00002ec0| 72 67 69 6e 67 20 69 74 | 73 20 66 69 6c 65 73 20 |rging it|s files |
|00002ed0| 77 69 74 68 20 74 68 65 | 69 72 20 72 65 76 69 73 |with the|ir revis|
|00002ee0| 69 6f 6e 73 20 61 6e 64 | 20 61 6e 63 65 73 74 6f |ions and| ancesto|
|00002ef0| 72 73 2e 0a 54 68 65 20 | 73 65 63 6f 6e 64 20 61 |rs..The |second a|
|00002f00| 72 67 75 6d 65 6e 74 2c | 20 52 45 47 45 58 50 2c |rgument,| REGEXP,|
|00002f10| 20 69 73 20 61 20 72 65 | 67 75 6c 61 72 20 65 78 | is a re|gular ex|
|00002f20| 70 72 65 73 73 69 6f 6e | 20 74 68 61 74 20 66 69 |pression| that fi|
|00002f30| 6c 74 65 72 73 20 74 68 | 65 20 66 69 6c 65 0a 6e |lters th|e file.n|
|00002f40| 61 6d 65 73 2e 20 4f 6e | 6c 79 20 74 68 65 20 66 |ames. On|ly the f|
|00002f50| 69 6c 65 73 20 74 68 61 | 74 20 61 72 65 20 75 6e |iles tha|t are un|
|00002f60| 64 65 72 20 72 65 76 69 | 73 69 6f 6e 20 63 6f 6e |der revi|sion con|
|00002f70| 74 72 6f 6c 20 61 72 65 | 20 74 61 6b 65 6e 20 69 |trol are| taken i|
|00002f80| 6e 74 6f 20 61 63 63 6f | 75 6e 74 2e 1f 0a 28 64 |nto acco|unt...(d|
|00002f90| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 6d |efalias |'ediff-m|
|00002fa0| 65 72 67 65 2d 64 69 72 | 65 63 74 6f 72 79 2d 72 |erge-dir|ectory-r|
|00002fb0| 65 76 69 73 69 6f 6e 73 | 2d 77 69 74 68 2d 61 6e |evisions|-with-an|
|00002fc0| 63 65 73 74 6f 72 20 23 | 5b 28 64 69 72 31 20 72 |cestor #|[(dir1 r|
|00002fd0| 65 67 65 78 70 29 20 22 | c0 09 5c 6e c3 c4 24 87 |egexp) "|..\n..$.|
|00002fe0| 22 20 5b 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f |" [ediff|-directo|
|00002ff0| 72 79 2d 72 65 76 69 73 | 69 6f 6e 73 2d 69 6e 74 |ry-revis|ions-int|
|00003000| 65 72 6e 61 6c 20 64 69 | 72 31 20 72 65 67 65 78 |ernal di|r1 regex|
|00003010| 70 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 72 65 |p ediff-|merge-re|
|00003020| 76 69 73 69 6f 6e 73 2d | 77 69 74 68 2d 61 6e 63 |visions-|with-anc|
|00003030| 65 73 74 6f 72 20 65 64 | 69 66 66 2d 6d 65 72 67 |estor ed|iff-merg|
|00003040| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 72 65 76 69 |e-direct|ory-revi|
|00003050| 73 69 6f 6e 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |sions-wi|th-ances|
|00003060| 74 6f 72 5d 20 35 20 28 | 23 24 20 2e 20 31 31 39 |tor] 5 (|#$ . 119|
|00003070| 33 34 29 20 28 6c 65 74 | 20 28 28 64 69 72 2d 41 |34) (let| ((dir-A|
|00003080| 20 28 65 64 69 66 66 2d | 67 65 74 2d 64 65 66 61 | (ediff-|get-defa|
|00003090| 75 6c 74 2d 64 69 72 65 | 63 74 6f 72 79 2d 6e 61 |ult-dire|ctory-na|
|000030a0| 6d 65 29 29 29 20 28 6c | 69 73 74 20 28 65 64 69 |me))) (l|ist (edi|
|000030b0| 66 66 2d 72 65 61 64 2d | 66 69 6c 65 2d 6e 61 6d |ff-read-|file-nam|
|000030c0| 65 20 22 44 69 72 65 63 | 74 6f 72 79 20 74 6f 20 |e "Direc|tory to |
|000030d0| 6d 65 72 67 65 20 77 69 | 74 68 20 72 65 76 69 73 |merge wi|th revis|
|000030e0| 69 6f 6e 73 20 61 6e 64 | 20 61 6e 63 65 73 74 6f |ions and| ancesto|
|000030f0| 72 73 3a 22 20 64 69 72 | 2d 41 20 6e 69 6c 29 20 |rs:" dir|-A nil) |
|00003100| 28 72 65 61 64 2d 73 74 | 72 69 6e 67 20 22 46 69 |(read-st|ring "Fi|
|00003110| 6c 74 65 72 20 74 68 72 | 6f 75 67 68 20 72 65 67 |lter thr|ough reg|
|00003120| 75 6c 61 72 20 65 78 70 | 72 65 73 73 69 6f 6e 3a |ular exp|ression:|
|00003130| 20 22 20 6e 69 6c 20 28 | 71 75 6f 74 65 20 65 64 | " nil (|quote ed|
|00003140| 69 66 66 2d 66 69 6c 74 | 65 72 69 6e 67 2d 72 65 |iff-filt|ering-re|
|00003150| 67 65 78 70 2d 68 69 73 | 74 6f 72 79 29 29 29 29 |gexp-his|tory))))|
|00003160| 5d 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |]).(byte|-code ".|
|00003170| c1 c2 5c 22 88 c0 c3 c4 | 5c 22 87 22 20 5b 64 65 |..\"....|\"." [de|
|00003180| 66 61 6c 69 61 73 20 65 | 64 69 72 2d 6d 65 72 67 |falias e|dir-merg|
|00003190| 65 2d 72 65 76 69 73 69 | 6f 6e 73 2d 77 69 74 68 |e-revisi|ons-with|
|000031a0| 2d 61 6e 63 65 73 74 6f | 72 20 65 64 69 66 66 2d |-ancesto|r ediff-|
|000031b0| 6d 65 72 67 65 2d 64 69 | 72 65 63 74 6f 72 79 2d |merge-di|rectory-|
|000031c0| 72 65 76 69 73 69 6f 6e | 73 2d 77 69 74 68 2d 61 |revision|s-with-a|
|000031d0| 6e 63 65 73 74 6f 72 20 | 65 64 69 72 73 2d 6d 65 |ncestor |edirs-me|
|000031e0| 72 67 65 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |rge-with|-ancesto|
|000031f0| 72 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 |r ediff-|merge-di|
|00003200| 72 65 63 74 6f 72 69 65 | 73 2d 77 69 74 68 2d 61 |rectorie|s-with-a|
|00003210| 6e 63 65 73 74 6f 72 5d | 20 33 29 0a 28 64 65 66 |ncestor]| 3).(def|
|00003220| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 64 69 72 |alias 'e|diff-dir|
|00003230| 65 63 74 6f 72 69 65 73 | 2d 69 6e 74 65 72 6e 61 |ectories|-interna|
|00003240| 6c 20 23 5b 28 64 69 72 | 31 20 64 69 72 32 20 64 |l #[(dir|1 dir2 d|
|00003250| 69 72 33 20 72 65 67 65 | 78 70 20 61 63 74 69 6f |ir3 rege|xp actio|
|00003260| 6e 20 6a 6f 62 6e 61 6d | 65 20 26 6f 70 74 69 6f |n jobnam|e &optio|
|00003270| 6e 61 6c 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |nal star|tup-hook|
|00003280| 73 29 20 22 c0 09 21 83 | 5c 6e 00 09 82 0d 00 c2 |s) "..!.|\n......|
|00003290| 09 21 11 c0 0b 21 83 18 | 00 0b 82 1b 00 c2 0b 21 |.!...!..|.......!|
|000032a0| 13 5c 66 3b 83 2f 00 c0 | 5c 66 21 83 2b 00 5c 66 |.\f;./..|\f!.+.\f|
|000032b0| 82 2e 00 c2 5c 66 21 14 | 09 0b 98 83 3d 00 c5 c6 |....\f!.|....=...|
|000032c0| 09 5c 22 88 82 64 00 0e | 07 c8 3d 83 52 00 09 5c |.\"..d..|..=.R..\|
|000032d0| 66 98 83 52 00 c5 c9 09 | 5c 22 88 82 64 00 0e 07 |f..R....|\"..d...|
|000032e0| c8 3d 83 64 00 0b 5c 66 | 98 83 64 00 c5 ca 09 5c |.=.d..\f|..d....\|
|000032f0| 22 88 cb 89 89 1e 5c 66 | 1e 0d 1e 0e cf 0e 07 ce |".....\f|........|
|00003300| 0e 10 09 0b 5c 66 26 06 | 16 0d d1 cb d2 d3 d4 0e |....\f&.|........|
|00003310| 15 44 45 d2 d6 d4 0e 0e | 44 45 46 0e 17 42 16 17 |.DE.....|DEF..B..|
|00003320| d8 d9 0e 0d da db 0e 07 | 0e 17 26 06 16 5c 66 dc |........|..&..\f.|
|00003330| 0e 5c 66 21 2b 87 22 20 | 5b 66 69 6c 65 2d 64 69 |.\f!+." |[file-di|
|00003340| 72 65 63 74 6f 72 79 2d | 70 20 64 69 72 31 20 66 |rectory-|p dir1 f|
|00003350| 69 6c 65 2d 6e 61 6d 65 | 2d 64 69 72 65 63 74 6f |ile-name|-directo|
|00003360| 72 79 20 64 69 72 32 20 | 64 69 72 33 20 65 72 72 |ry dir2 |dir3 err|
|00003370| 6f 72 20 22 44 69 72 65 | 63 74 6f 72 69 65 73 20 |or "Dire|ctories |
|00003380| 41 20 61 6e 64 20 42 20 | 61 72 65 20 74 68 65 20 |A and B |are the |
|00003390| 73 61 6d 65 3a 20 25 73 | 22 20 6a 6f 62 6e 61 6d |same: %s|" jobnam|
|000033a0| 65 20 65 64 69 66 66 2d | 64 69 72 65 63 74 6f 72 |e ediff-|director|
|000033b0| 69 65 73 33 20 22 44 69 | 72 65 63 74 6f 72 69 65 |ies3 "Di|rectorie|
|000033c0| 73 20 41 20 61 6e 64 20 | 43 20 61 72 65 20 74 68 |s A and |C are th|
|000033d0| 65 20 73 61 6d 65 3a 20 | 25 73 22 20 22 44 69 72 |e same: |%s" "Dir|
|000033e0| 65 63 74 6f 72 69 65 73 | 20 42 20 61 6e 64 20 43 |ectories| B and C|
|000033f0| 20 61 72 65 20 74 68 65 | 20 73 61 6d 65 3a 20 25 | are the| same: %|
|00003400| 73 22 20 6e 69 6c 20 6d | 65 74 61 2d 62 75 66 20 |s" nil m|eta-buf |
|00003410| 66 69 6c 65 2d 6c 69 73 | 74 20 64 69 66 66 73 20 |file-lis|t diffs |
|00003420| 65 64 69 66 66 2d 69 6e | 74 65 72 73 65 63 74 2d |ediff-in|tersect-|
|00003430| 64 69 72 65 63 74 6f 72 | 69 65 73 20 72 65 67 65 |director|ies rege|
|00003440| 78 70 20 6c 61 6d 62 64 | 61 20 73 65 74 71 20 65 |xp lambd|a setq e|
|00003450| 64 69 66 66 2d 73 65 73 | 73 69 6f 6e 2d 61 63 74 |diff-ses|sion-act|
|00003460| 69 6f 6e 2d 66 75 6e 63 | 74 69 6f 6e 20 71 75 6f |ion-func|tion quo|
|00003470| 74 65 20 61 63 74 69 6f | 6e 20 65 64 69 66 66 2d |te actio|n ediff-|
|00003480| 64 69 72 2d 64 69 66 66 | 65 72 65 6e 63 65 2d 6c |dir-diff|erence-l|
|00003490| 69 73 74 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |ist star|tup-hook|
|000034a0| 73 20 65 64 69 66 66 2d | 70 72 65 70 61 72 65 2d |s ediff-|prepare-|
|000034b0| 6d 65 74 61 2d 62 75 66 | 66 65 72 20 65 64 69 66 |meta-buf|fer edif|
|000034c0| 66 2d 66 69 6c 65 67 72 | 6f 75 70 2d 61 63 74 69 |f-filegr|oup-acti|
|000034d0| 6f 6e 20 22 2a 45 64 69 | 66 66 20 53 65 73 73 69 |on "*Edi|ff Sessi|
|000034e0| 6f 6e 20 47 72 6f 75 70 | 20 50 61 6e 65 6c 22 20 |on Group| Panel" |
|000034f0| 65 64 69 66 66 2d 72 65 | 64 72 61 77 2d 64 69 72 |ediff-re|draw-dir|
|00003500| 65 63 74 6f 72 79 2d 67 | 72 6f 75 70 2d 62 75 66 |ectory-g|roup-buf|
|00003510| 66 65 72 20 65 64 69 66 | 66 2d 73 68 6f 77 2d 6d |fer edif|f-show-m|
|00003520| 65 74 61 2d 62 75 66 66 | 65 72 5d 20 37 5d 29 0a |eta-buff|er] 7]).|
|00003530| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00003540| 2d 64 69 72 65 63 74 6f | 72 79 2d 72 65 76 69 73 |-directo|ry-revis|
|00003550| 69 6f 6e 73 2d 69 6e 74 | 65 72 6e 61 6c 20 23 5b |ions-int|ernal #[|
|00003560| 28 64 69 72 31 20 72 65 | 67 65 78 70 20 61 63 74 |(dir1 re|gexp act|
|00003570| 69 6f 6e 20 6a 6f 62 6e | 61 6d 65 20 26 6f 70 74 |ion jobn|ame &opt|
|00003580| 69 6f 6e 61 6c 20 73 74 | 61 72 74 75 70 2d 68 6f |ional st|artup-ho|
|00003590| 6f 6b 73 29 20 22 c0 09 | 21 83 5c 6e 00 09 82 0d |oks) "..|!.\n....|
|000035a0| 00 c2 09 21 11 c3 89 1c | 1d c6 0e 07 0e 08 09 23 |...!....|.......#|
|000035b0| 15 c9 c3 ca cb cc 0e 0d | 44 45 45 0e 0e 42 16 0e |........|DEE..B..|
|000035c0| cf d0 0d d1 d2 0e 07 0e | 0e 26 06 14 d3 5c 66 21 |........|.&...\f!|
|000035d0| 2a 87 22 20 5b 66 69 6c | 65 2d 64 69 72 65 63 74 |*." [fil|e-direct|
|000035e0| 6f 72 79 2d 70 20 64 69 | 72 31 20 66 69 6c 65 2d |ory-p di|r1 file-|
|000035f0| 6e 61 6d 65 2d 64 69 72 | 65 63 74 6f 72 79 20 6e |name-dir|ectory n|
|00003600| 69 6c 20 6d 65 74 61 2d | 62 75 66 20 66 69 6c 65 |il meta-|buf file|
|00003610| 2d 6c 69 73 74 20 65 64 | 69 66 66 2d 67 65 74 2d |-list ed|iff-get-|
|00003620| 64 69 72 65 63 74 6f 72 | 79 2d 66 69 6c 65 73 2d |director|y-files-|
|00003630| 75 6e 64 65 72 2d 72 65 | 76 69 73 69 6f 6e 20 6a |under-re|vision j|
|00003640| 6f 62 6e 61 6d 65 20 72 | 65 67 65 78 70 20 6c 61 |obname r|egexp la|
|00003650| 6d 62 64 61 20 73 65 74 | 71 20 65 64 69 66 66 2d |mbda set|q ediff-|
|00003660| 73 65 73 73 69 6f 6e 2d | 61 63 74 69 6f 6e 2d 66 |session-|action-f|
|00003670| 75 6e 63 74 69 6f 6e 20 | 71 75 6f 74 65 20 61 63 |unction |quote ac|
|00003680| 74 69 6f 6e 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |tion sta|rtup-hoo|
|00003690| 6b 73 20 65 64 69 66 66 | 2d 70 72 65 70 61 72 65 |ks ediff|-prepare|
|000036a0| 2d 6d 65 74 61 2d 62 75 | 66 66 65 72 20 65 64 69 |-meta-bu|ffer edi|
|000036b0| 66 66 2d 66 69 6c 65 67 | 72 6f 75 70 2d 61 63 74 |ff-fileg|roup-act|
|000036c0| 69 6f 6e 20 22 2a 45 64 | 69 66 66 20 53 65 73 73 |ion "*Ed|iff Sess|
|000036d0| 69 6f 6e 20 47 72 6f 75 | 70 20 50 61 6e 65 6c 22 |ion Grou|p Panel"|
|000036e0| 20 65 64 69 66 66 2d 72 | 65 64 72 61 77 2d 64 69 | ediff-r|edraw-di|
|000036f0| 72 65 63 74 6f 72 79 2d | 67 72 6f 75 70 2d 62 75 |rectory-|group-bu|
|00003700| 66 66 65 72 20 65 64 69 | 66 66 2d 73 68 6f 77 2d |ffer edi|ff-show-|
|00003710| 6d 65 74 61 2d 62 75 66 | 66 65 72 5d 20 37 5d 29 |meta-buf|fer] 7])|
|00003720| 0a 23 40 32 33 36 20 43 | 6f 6d 70 61 72 65 20 57 |.#@236 C|ompare W|
|00003730| 49 4e 44 2d 41 20 61 6e | 64 20 57 49 4e 44 2d 42 |IND-A an|d WIND-B|
|00003740| 2c 20 77 68 69 63 68 20 | 61 72 65 20 73 65 6c 65 |, which |are sele|
|00003750| 63 74 65 64 20 62 79 20 | 63 6c 69 63 6b 69 6e 67 |cted by |clicking|
|00003760| 2c 20 77 6f 72 64 77 69 | 73 65 2e 0a 57 69 74 68 |, wordwi|se..With|
|00003770| 20 70 72 65 66 69 78 20 | 61 72 67 75 6d 65 6e 74 | prefix |argument|
|00003780| 2c 20 44 55 4d 42 2d 4d | 4f 44 45 2c 20 6f 72 20 |, DUMB-M|ODE, or |
|00003790| 6f 6e 20 61 20 6e 6f 6e | 2d 77 69 6e 64 6f 77 69 |on a non|-windowi|
|000037a0| 6e 67 20 64 69 73 70 6c | 61 79 2c 20 77 6f 72 6b |ng displ|ay, work|
|000037b0| 73 20 61 73 0a 66 6f 6c | 6c 6f 77 73 3a 0a 49 66 |s as.fol|lows:.If|
|000037c0| 20 57 49 4e 44 2d 41 20 | 69 73 20 6e 69 6c 2c 20 | WIND-A |is nil, |
|000037d0| 75 73 65 20 73 65 6c 65 | 63 74 65 64 20 77 69 6e |use sele|cted win|
|000037e0| 64 6f 77 2e 0a 49 66 20 | 57 49 4e 44 2d 42 20 69 |dow..If |WIND-B i|
|000037f0| 73 20 6e 69 6c 2c 20 75 | 73 65 20 77 69 6e 64 6f |s nil, u|se windo|
|00003800| 77 20 6e 65 78 74 20 74 | 6f 20 57 49 4e 44 2d 41 |w next t|o WIND-A|
|00003810| 2e 1f 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |...(defa|lias 'ed|
|00003820| 69 66 66 2d 77 69 6e 64 | 6f 77 73 2d 77 6f 72 64 |iff-wind|ows-word|
|00003830| 77 69 73 65 20 23 5b 28 | 64 75 6d 62 2d 6d 6f 64 |wise #[(|dumb-mod|
|00003840| 65 20 26 6f 70 74 69 6f | 6e 61 6c 20 77 69 6e 64 |e &optio|nal wind|
|00003850| 2d 41 20 77 69 6e 64 2d | 42 20 73 74 61 72 74 75 |-A wind-|B startu|
|00003860| 70 2d 68 6f 6f 6b 73 29 | 20 22 c0 09 5c 6e 0b 5c |p-hooks)| "..\n.\|
|00003870| 66 c5 c6 26 06 87 22 20 | 5b 65 64 69 66 66 2d 77 |f..&.." |[ediff-w|
|00003880| 69 6e 64 6f 77 73 20 64 | 75 6d 62 2d 6d 6f 64 65 |indows d|umb-mode|
|00003890| 20 77 69 6e 64 2d 41 20 | 77 69 6e 64 2d 42 20 73 | wind-A |wind-B s|
|000038a0| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 65 64 69 |tartup-h|ooks edi|
|000038b0| 66 66 2d 77 69 6e 64 6f | 77 73 2d 77 6f 72 64 77 |ff-windo|ws-wordw|
|000038c0| 69 73 65 20 77 6f 72 64 | 2d 6d 6f 64 65 5d 20 37 |ise word|-mode] 7|
|000038d0| 20 28 23 24 20 2e 20 31 | 34 31 31 39 29 20 22 50 | (#$ . 1|4119) "P|
|000038e0| 22 5d 29 0a 23 40 32 33 | 36 20 43 6f 6d 70 61 72 |"]).#@23|6 Compar|
|000038f0| 65 20 57 49 4e 44 2d 41 | 20 61 6e 64 20 57 49 4e |e WIND-A| and WIN|
|00003900| 44 2d 42 2c 20 77 68 69 | 63 68 20 61 72 65 20 73 |D-B, whi|ch are s|
|00003910| 65 6c 65 63 74 65 64 20 | 62 79 20 63 6c 69 63 6b |elected |by click|
|00003920| 69 6e 67 2c 20 6c 69 6e | 65 77 69 73 65 2e 0a 57 |ing, lin|ewise..W|
|00003930| 69 74 68 20 70 72 65 66 | 69 78 20 61 72 67 75 6d |ith pref|ix argum|
|00003940| 65 6e 74 2c 20 44 55 4d | 42 2d 4d 4f 44 45 2c 20 |ent, DUM|B-MODE, |
|00003950| 6f 72 20 6f 6e 20 61 20 | 6e 6f 6e 2d 77 69 6e 64 |or on a |non-wind|
|00003960| 6f 77 69 6e 67 20 64 69 | 73 70 6c 61 79 2c 20 77 |owing di|splay, w|
|00003970| 6f 72 6b 73 20 61 73 0a | 66 6f 6c 6c 6f 77 73 3a |orks as.|follows:|
|00003980| 0a 49 66 20 57 49 4e 44 | 2d 41 20 69 73 20 6e 69 |.If WIND|-A is ni|
|00003990| 6c 2c 20 75 73 65 20 73 | 65 6c 65 63 74 65 64 20 |l, use s|elected |
|000039a0| 77 69 6e 64 6f 77 2e 0a | 49 66 20 57 49 4e 44 2d |window..|If WIND-|
|000039b0| 42 20 69 73 20 6e 69 6c | 2c 20 75 73 65 20 77 69 |B is nil|, use wi|
|000039c0| 6e 64 6f 77 20 6e 65 78 | 74 20 74 6f 20 57 49 4e |ndow nex|t to WIN|
|000039d0| 44 2d 41 2e 1f 0a 28 64 | 65 66 61 6c 69 61 73 20 |D-A...(d|efalias |
|000039e0| 27 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 73 2d 6c |'ediff-w|indows-l|
|000039f0| 69 6e 65 77 69 73 65 20 | 23 5b 28 64 75 6d 62 2d |inewise |#[(dumb-|
|00003a00| 6d 6f 64 65 20 26 6f 70 | 74 69 6f 6e 61 6c 20 77 |mode &op|tional w|
|00003a10| 69 6e 64 2d 41 20 77 69 | 6e 64 2d 42 20 73 74 61 |ind-A wi|nd-B sta|
|00003a20| 72 74 75 70 2d 68 6f 6f | 6b 73 29 20 22 c0 09 5c |rtup-hoo|ks) "..\|
|00003a30| 6e 0b 5c 66 c5 c6 26 06 | 87 22 20 5b 65 64 69 66 |n.\f..&.|." [edif|
|00003a40| 66 2d 77 69 6e 64 6f 77 | 73 20 64 75 6d 62 2d 6d |f-window|s dumb-m|
|00003a50| 6f 64 65 20 77 69 6e 64 | 2d 41 20 77 69 6e 64 2d |ode wind|-A wind-|
|00003a60| 42 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 20 |B startu|p-hooks |
|00003a70| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 73 2d 6c 69 |ediff-wi|ndows-li|
|00003a80| 6e 65 77 69 73 65 20 6e | 69 6c 5d 20 37 20 28 23 |newise n|il] 7 (#|
|00003a90| 24 20 2e 20 31 34 35 37 | 30 29 20 22 50 22 5d 29 |$ . 1457|0) "P"])|
|00003aa0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00003ab0| 66 2d 77 69 6e 64 6f 77 | 73 20 23 5b 28 64 75 6d |f-window|s #[(dum|
|00003ac0| 62 2d 6d 6f 64 65 20 77 | 69 6e 64 2d 41 20 77 69 |b-mode w|ind-A wi|
|00003ad0| 6e 64 2d 42 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |nd-B sta|rtup-hoo|
|00003ae0| 6b 73 20 6a 6f 62 2d 6e | 61 6d 65 20 77 6f 72 64 |ks job-n|ame word|
|00003af0| 2d 6d 6f 64 65 29 20 22 | 08 84 09 00 c1 20 84 42 |-mode) "|..... .B|
|00003b00| 00 5c 6e c3 1c 1d c6 0d | 21 86 21 00 5c 66 83 1d |.\n.....|!.!.\f..|
|00003b10| 00 c7 0d 21 82 1f 00 c8 | 20 89 15 2a 12 0e 09 5c |...!....| ..*...\|
|00003b20| 6e 1c 1d c6 0d 21 86 3c | 00 5c 66 83 38 00 c7 0d |n....!.<|.\f.8...|
|00003b30| 21 82 3a 00 c8 20 89 15 | 2a 16 09 82 50 00 ca 5c |!.:.. ..|*...P..\|
|00003b40| 6e c3 cb 23 12 ca 0e 09 | 5c 6e cc 23 16 09 cd 5c |n..#....|\n.#...\|
|00003b50| 6e 21 cd 0e 09 21 c3 89 | 89 89 1e 0e 1e 0f 1e 10 |n!...!..|........|
|00003b60| 1e 11 1e 12 1e 13 8a d4 | 8b 88 29 d5 0e 13 0e 11 |........|..).....|
|00003b70| 0e 10 0e 12 0e 0f 0e 0e | 0e 16 0e 17 0e 18 26 09 |........|......&.|
|00003b80| 2e 06 87 22 20 5b 64 75 | 6d 62 2d 6d 6f 64 65 20 |..." [du|mb-mode |
|00003b90| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 64 69 73 |ediff-wi|ndow-dis|
|00003ba0| 70 6c 61 79 2d 70 20 77 | 69 6e 64 2d 41 20 6e 69 |play-p w|ind-A ni|
|00003bb0| 6c 20 70 72 65 76 2d 77 | 69 6e 64 20 77 69 6e 64 |l prev-w|ind wind|
|00003bc0| 20 77 69 6e 64 6f 77 2d | 6c 69 76 65 2d 70 20 6e | window-|live-p n|
|00003bd0| 65 78 74 2d 77 69 6e 64 | 6f 77 20 73 65 6c 65 63 |ext-wind|ow selec|
|00003be0| 74 65 64 2d 77 69 6e 64 | 6f 77 20 77 69 6e 64 2d |ted-wind|ow wind-|
|00003bf0| 42 20 65 64 69 66 66 2d | 67 65 74 2d 77 69 6e 64 |B ediff-|get-wind|
|00003c00| 6f 77 2d 62 79 2d 63 6c | 69 63 6b 69 6e 67 20 31 |ow-by-cl|icking 1|
|00003c10| 20 32 20 77 69 6e 64 6f | 77 2d 62 75 66 66 65 72 | 2 windo|w-buffer|
|00003c20| 20 65 6e 64 2d 42 20 62 | 65 67 2d 42 20 65 6e 64 | end-B b|eg-B end|
|00003c30| 2d 41 20 62 65 67 2d 41 | 20 62 75 66 66 65 72 2d |-A beg-A| buffer-|
|00003c40| 42 20 62 75 66 66 65 72 | 2d 41 20 28 28 62 79 74 |B buffer|-A ((byt|
|00003c50| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 0b 21 88 |e-code "|..!...!.|
|00003c60| c4 20 15 c6 20 16 07 c2 | 0e 08 21 88 c4 20 16 09 |. .. ...|..!.. ..|
|00003c70| c6 20 16 5c 6e c0 87 22 | 20 5b 73 69 74 2d 66 6f |. .\n.."| [sit-fo|
|00003c80| 72 20 30 20 73 65 6c 65 | 63 74 2d 77 69 6e 64 6f |r 0 sele|ct-windo|
|00003c90| 77 20 77 69 6e 64 2d 41 | 20 77 69 6e 64 6f 77 2d |w wind-A| window-|
|00003ca0| 73 74 61 72 74 20 62 65 | 67 2d 41 20 77 69 6e 64 |start be|g-A wind|
|00003cb0| 6f 77 2d 65 6e 64 20 65 | 6e 64 2d 41 20 77 69 6e |ow-end e|nd-A win|
|00003cc0| 64 2d 42 20 62 65 67 2d | 42 20 65 6e 64 2d 42 5d |d-B beg-|B end-B]|
|00003cd0| 20 32 29 29 20 65 64 69 | 66 66 2d 72 65 67 69 6f | 2)) edi|ff-regio|
|00003ce0| 6e 73 2d 69 6e 74 65 72 | 6e 61 6c 20 73 74 61 72 |ns-inter|nal star|
|00003cf0| 74 75 70 2d 68 6f 6f 6b | 73 20 6a 6f 62 2d 6e 61 |tup-hook|s job-na|
|00003d00| 6d 65 20 77 6f 72 64 2d | 6d 6f 64 65 5d 20 31 30 |me word-|mode] 10|
|00003d10| 5d 29 0a 23 40 32 35 31 | 20 52 75 6e 20 45 64 69 |]).#@251| Run Edi|
|00003d20| 66 66 20 6f 6e 20 61 20 | 70 61 69 72 20 6f 66 20 |ff on a |pair of |
|00003d30| 72 65 67 69 6f 6e 73 20 | 69 6e 20 74 77 6f 20 64 |regions |in two d|
|00003d40| 69 66 66 65 72 65 6e 74 | 20 62 75 66 66 65 72 73 |ifferent| buffers|
|00003d50| 2e 0a 52 65 67 69 6f 6e | 73 20 28 69 2e 65 2e 2c |..Region|s (i.e.,|
|00003d60| 20 70 6f 69 6e 74 20 61 | 6e 64 20 6d 61 72 6b 29 | point a|nd mark)|
|00003d70| 20 61 72 65 20 61 73 73 | 75 6d 65 64 20 74 6f 20 | are ass|umed to |
|00003d80| 62 65 20 73 65 74 20 69 | 6e 20 61 64 76 61 6e 63 |be set i|n advanc|
|00003d90| 65 2e 0a 54 68 69 73 20 | 66 75 6e 63 74 69 6f 6e |e..This |function|
|00003da0| 20 69 73 20 65 66 66 65 | 63 74 69 76 65 20 6f 6e | is effe|ctive on|
|00003db0| 6c 79 20 66 6f 72 20 72 | 65 6c 61 74 69 76 65 6c |ly for r|elativel|
|00003dc0| 79 20 73 6d 61 6c 6c 20 | 72 65 67 69 6f 6e 73 2c |y small |regions,|
|00003dd0| 20 75 70 20 74 6f 20 32 | 30 30 0a 6c 69 6e 65 73 | up to 2|00.lines|
|00003de0| 2e 20 46 6f 72 20 6c 61 | 72 67 65 20 72 65 67 69 |. For la|rge regi|
|00003df0| 6f 6e 73 2c 20 75 73 65 | 20 60 65 64 69 66 66 2d |ons, use| `ediff-|
|00003e00| 72 65 67 69 6f 6e 73 2d | 6c 69 6e 65 77 69 73 65 |regions-|linewise|
|00003e10| 27 2e 1f 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |'...(def|alias 'e|
|00003e20| 64 69 66 66 2d 72 65 67 | 69 6f 6e 73 2d 77 6f 72 |diff-reg|ions-wor|
|00003e30| 64 77 69 73 65 20 23 5b | 28 62 75 66 66 65 72 2d |dwise #[|(buffer-|
|00003e40| 41 20 62 75 66 66 65 72 | 2d 42 20 26 6f 70 74 69 |A buffer|-B &opti|
|00003e50| 6f 6e 61 6c 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |onal sta|rtup-hoo|
|00003e60| 6b 73 29 20 22 08 83 12 | 00 c1 08 21 83 12 00 c2 |ks) "...|...!....|
|00003e70| c1 08 21 21 84 17 00 c3 | c4 08 5c 22 88 0d 83 29 |..!!....|..\"...)|
|00003e80| 00 c1 0d 21 83 29 00 c2 | c1 0d 21 21 84 2e 00 c3 |...!.)..|..!!....|
|00003e90| c4 0d 5c 22 88 c6 89 89 | 89 1e 07 1e 08 1e 09 1e |..\"....|........|
|00003ea0| 5c 6e 8a 08 71 88 cb 20 | 16 5c 6e cc 20 16 09 0d |\n..q.. |.\n. ...|
|00003eb0| 71 88 cb 20 16 08 cc 20 | 16 07 29 cd c1 08 21 0e |q.. ... |..)...!.|
|00003ec0| 5c 6e 0e 09 c1 0d 21 0e | 08 0e 07 0e 0e cf d0 26 |\n....!.|.......&|
|00003ed0| 09 2c 87 22 20 5b 62 75 | 66 66 65 72 2d 41 20 67 |.,." [bu|ffer-A g|
|00003ee0| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|00003ef0| 2d 6e 61 6d 65 20 65 72 | 72 6f 72 20 22 42 75 66 |-name er|ror "Buf|
|00003f00| 66 65 72 20 25 53 20 64 | 6f 65 73 6e 27 74 20 65 |fer %S d|oesn't e|
|00003f10| 78 69 73 74 22 20 62 75 | 66 66 65 72 2d 42 20 6e |xist" bu|ffer-B n|
|00003f20| 69 6c 20 72 65 67 2d 42 | 2d 65 6e 64 20 72 65 67 |il reg-B|-end reg|
|00003f30| 2d 42 2d 62 65 67 20 72 | 65 67 2d 41 2d 65 6e 64 |-B-beg r|eg-A-end|
|00003f40| 20 72 65 67 2d 41 2d 62 | 65 67 20 72 65 67 69 6f | reg-A-b|eg regio|
|00003f50| 6e 2d 62 65 67 69 6e 6e | 69 6e 67 20 72 65 67 69 |n-beginn|ing regi|
|00003f60| 6f 6e 2d 65 6e 64 20 65 | 64 69 66 66 2d 72 65 67 |on-end e|diff-reg|
|00003f70| 69 6f 6e 73 2d 69 6e 74 | 65 72 6e 61 6c 20 73 74 |ions-int|ernal st|
|00003f80| 61 72 74 75 70 2d 68 6f | 6f 6b 73 20 65 64 69 66 |artup-ho|oks edif|
|00003f90| 66 2d 72 65 67 69 6f 6e | 73 2d 77 6f 72 64 77 69 |f-region|s-wordwi|
|00003fa0| 73 65 20 77 6f 72 64 2d | 6d 6f 64 65 5d 20 31 30 |se word-|mode] 10|
|00003fb0| 20 28 23 24 20 2e 20 31 | 35 36 34 31 29 20 28 6c | (#$ . 1|5641) (l|
|00003fc0| 65 74 20 28 62 66 29 20 | 28 6c 69 73 74 20 28 73 |et (bf) |(list (s|
|00003fd0| 65 74 71 20 62 66 20 28 | 72 65 61 64 2d 62 75 66 |etq bf (|read-buf|
|00003fe0| 66 65 72 20 22 52 65 67 | 69 6f 6e 27 73 20 41 20 |fer "Reg|ion's A |
|00003ff0| 62 75 66 66 65 72 3a 20 | 22 20 28 65 64 69 66 66 |buffer: |" (ediff|
|00004000| 2d 6f 74 68 65 72 2d 62 | 75 66 66 65 72 20 22 22 |-other-b|uffer ""|
|00004010| 29 20 74 29 29 20 28 72 | 65 61 64 2d 62 75 66 66 |) t)) (r|ead-buff|
|00004020| 65 72 20 22 52 65 67 69 | 6f 6e 27 73 20 42 20 62 |er "Regi|on's B b|
|00004030| 75 66 66 65 72 3a 20 22 | 20 28 70 72 6f 67 6e 20 |uffer: "| (progn |
|00004040| 28 73 61 76 65 2d 77 69 | 6e 64 6f 77 2d 65 78 63 |(save-wi|ndow-exc|
|00004050| 75 72 73 69 6f 6e 20 28 | 6f 74 68 65 72 2d 77 69 |ursion (|other-wi|
|00004060| 6e 64 6f 77 20 31 29 29 | 20 28 65 64 69 66 66 2d |ndow 1))| (ediff-|
|00004070| 6f 74 68 65 72 2d 62 75 | 66 66 65 72 20 62 66 29 |other-bu|ffer bf)|
|00004080| 29 20 74 29 29 29 5d 29 | 0a 23 40 32 38 35 20 52 |) t)))])|.#@285 R|
|00004090| 75 6e 20 45 64 69 66 66 | 20 6f 6e 20 61 20 70 61 |un Ediff| on a pa|
|000040a0| 69 72 20 6f 66 20 72 65 | 67 69 6f 6e 73 20 69 6e |ir of re|gions in|
|000040b0| 20 74 77 6f 20 64 69 66 | 66 65 72 65 6e 74 20 62 | two dif|ferent b|
|000040c0| 75 66 66 65 72 73 2e 0a | 52 65 67 69 6f 6e 73 20 |uffers..|Regions |
|000040d0| 28 69 2e 65 2e 2c 20 70 | 6f 69 6e 74 20 61 6e 64 |(i.e., p|oint and|
|000040e0| 20 6d 61 72 6b 29 20 61 | 72 65 20 61 73 73 75 6d | mark) a|re assum|
|000040f0| 65 64 20 74 6f 20 62 65 | 20 73 65 74 20 69 6e 20 |ed to be| set in |
|00004100| 61 64 76 61 6e 63 65 2e | 0a 45 61 63 68 20 72 65 |advance.|.Each re|
|00004110| 67 69 6f 6e 20 69 73 20 | 65 6e 6c 61 72 67 65 64 |gion is |enlarged|
|00004120| 20 74 6f 20 63 6f 6e 74 | 61 69 6e 20 66 75 6c 6c | to cont|ain full|
|00004130| 20 6c 69 6e 65 73 2e 0a | 54 68 69 73 20 66 75 6e | lines..|This fun|
|00004140| 63 74 69 6f 6e 20 69 73 | 20 65 66 66 65 63 74 69 |ction is| effecti|
|00004150| 76 65 20 66 6f 72 20 6c | 61 72 67 65 20 72 65 67 |ve for l|arge reg|
|00004160| 69 6f 6e 73 2c 20 6f 76 | 65 72 20 31 30 30 2d 32 |ions, ov|er 100-2|
|00004170| 30 30 0a 6c 69 6e 65 73 | 2e 20 46 6f 72 20 73 6d |00.lines|. For sm|
|00004180| 61 6c 6c 20 72 65 67 69 | 6f 6e 73 2c 20 75 73 65 |all regi|ons, use|
|00004190| 20 60 65 64 69 66 66 2d | 72 65 67 69 6f 6e 73 2d | `ediff-|regions-|
|000041a0| 77 6f 72 64 77 69 73 65 | 27 2e 1f 0a 28 64 65 66 |wordwise|'...(def|
|000041b0| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 72 65 67 |alias 'e|diff-reg|
|000041c0| 69 6f 6e 73 2d 6c 69 6e | 65 77 69 73 65 20 23 5b |ions-lin|ewise #[|
|000041d0| 28 62 75 66 66 65 72 2d | 41 20 62 75 66 66 65 72 |(buffer-|A buffer|
|000041e0| 2d 42 20 26 6f 70 74 69 | 6f 6e 61 6c 20 73 74 61 |-B &opti|onal sta|
|000041f0| 72 74 75 70 2d 68 6f 6f | 6b 73 29 20 22 08 83 12 |rtup-hoo|ks) "...|
|00004200| 00 c1 08 21 83 12 00 c2 | c1 08 21 21 84 17 00 c3 |...!....|..!!....|
|00004210| c4 08 5c 22 88 0d 83 29 | 00 c1 0d 21 83 29 00 c2 |..\"...)|...!.)..|
|00004220| c1 0d 21 21 84 2e 00 c3 | c4 0d 5c 22 88 c6 89 89 |..!!....|..\"....|
|00004230| 89 1e 07 1e 08 1e 09 1e | 5c 6e 8a 08 71 88 cb 20 |........|\n..q.. |
|00004240| 16 5c 6e cc 20 16 09 0e | 5c 6e 62 88 cd 79 88 60 |.\n. ...|\nb..y.`|
|00004250| 16 5c 6e 0e 09 62 88 c6 | 7f 88 6d 84 5e 00 c6 75 |.\n..b..|..m.^..u|
|00004260| 88 60 16 09 0d 71 88 cb | 20 16 08 cc 20 16 07 0e |.`...q..| ... ...|
|00004270| 5c 6e 62 88 0e 08 62 88 | cd 79 88 60 16 08 0e 07 |\nb...b.|.y.`....|
|00004280| 62 88 c6 7f 88 6d 84 88 | 00 c6 75 88 60 16 07 29 |b....m..|..u.`..)|
|00004290| ce c1 08 21 0e 5c 6e 0e | 09 c1 0d 21 0e 08 0e 07 |...!.\n.|...!....|
|000042a0| 0e 0f d0 c6 26 09 2c 87 | 22 20 5b 62 75 66 66 65 |....&.,.|" [buffe|
|000042b0| 72 2d 41 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |r-A get-|buffer b|
|000042c0| 75 66 66 65 72 2d 6e 61 | 6d 65 20 65 72 72 6f 72 |uffer-na|me error|
|000042d0| 20 22 42 75 66 66 65 72 | 20 25 53 20 64 6f 65 73 | "Buffer| %S does|
|000042e0| 6e 27 74 20 65 78 69 73 | 74 22 20 62 75 66 66 65 |n't exis|t" buffe|
|000042f0| 72 2d 42 20 6e 69 6c 20 | 72 65 67 2d 42 2d 65 6e |r-B nil |reg-B-en|
|00004300| 64 20 72 65 67 2d 42 2d | 62 65 67 20 72 65 67 2d |d reg-B-|beg reg-|
|00004310| 41 2d 65 6e 64 20 72 65 | 67 2d 41 2d 62 65 67 20 |A-end re|g-A-beg |
|00004320| 72 65 67 69 6f 6e 2d 62 | 65 67 69 6e 6e 69 6e 67 |region-b|eginning|
|00004330| 20 72 65 67 69 6f 6e 2d | 65 6e 64 20 30 20 65 64 | region-|end 0 ed|
|00004340| 69 66 66 2d 72 65 67 69 | 6f 6e 73 2d 69 6e 74 65 |iff-regi|ons-inte|
|00004350| 72 6e 61 6c 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |rnal sta|rtup-hoo|
|00004360| 6b 73 20 65 64 69 66 66 | 2d 72 65 67 69 6f 6e 73 |ks ediff|-regions|
|00004370| 2d 6c 69 6e 65 77 69 73 | 65 5d 20 31 30 20 28 23 |-linewis|e] 10 (#|
|00004380| 24 20 2e 20 31 36 35 32 | 37 29 20 28 6c 65 74 20 |$ . 1652|7) (let |
|00004390| 28 62 66 29 20 28 6c 69 | 73 74 20 28 73 65 74 71 |(bf) (li|st (setq|
|000043a0| 20 62 66 20 28 72 65 61 | 64 2d 62 75 66 66 65 72 | bf (rea|d-buffer|
|000043b0| 20 22 52 65 67 69 6f 6e | 20 41 27 73 20 62 75 66 | "Region| A's buf|
|000043c0| 66 65 72 3a 20 22 20 28 | 65 64 69 66 66 2d 6f 74 |fer: " (|ediff-ot|
|000043d0| 68 65 72 2d 62 75 66 66 | 65 72 20 22 22 29 20 74 |her-buff|er "") t|
|000043e0| 29 29 20 28 72 65 61 64 | 2d 62 75 66 66 65 72 20 |)) (read|-buffer |
|000043f0| 22 52 65 67 69 6f 6e 20 | 42 27 73 20 62 75 66 66 |"Region |B's buff|
|00004400| 65 72 3a 20 22 20 28 70 | 72 6f 67 6e 20 28 73 61 |er: " (p|rogn (sa|
|00004410| 76 65 2d 77 69 6e 64 6f | 77 2d 65 78 63 75 72 73 |ve-windo|w-excurs|
|00004420| 69 6f 6e 20 28 6f 74 68 | 65 72 2d 77 69 6e 64 6f |ion (oth|er-windo|
|00004430| 77 20 31 29 29 20 28 65 | 64 69 66 66 2d 6f 74 68 |w 1)) (e|diff-oth|
|00004440| 65 72 2d 62 75 66 66 65 | 72 20 62 66 29 29 20 74 |er-buffe|r bf)) t|
|00004450| 29 29 29 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |)))]).(d|efalias |
|00004460| 27 65 64 69 66 66 2d 72 | 65 67 69 6f 6e 73 2d 69 |'ediff-r|egions-i|
|00004470| 6e 74 65 72 6e 61 6c 20 | 23 5b 28 62 75 66 66 65 |nternal |#[(buffe|
|00004480| 72 2d 41 20 62 65 67 2d | 41 20 65 6e 64 2d 41 20 |r-A beg-|A end-A |
|00004490| 62 75 66 66 65 72 2d 42 | 20 62 65 67 2d 42 20 65 |buffer-B| beg-B e|
|000044a0| 6e 64 2d 42 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |nd-B sta|rtup-hoo|
|000044b0| 6b 73 20 6a 6f 62 2d 6e | 61 6d 65 20 77 6f 72 64 |ks job-n|ame word|
|000044c0| 2d 6d 6f 64 65 29 20 22 | c0 09 21 c2 89 89 89 1b |-mode) "|..!.....|
|000044d0| 1c 1d 1e 06 1e 07 70 1e | 08 0e 09 83 40 00 ca 0e |......p.|....@...|
|000044e0| 09 21 83 40 00 cb ca 0e | 09 21 21 83 40 00 cc 8e |.!.@....|.!!.@...|
|000044f0| 0e 09 71 88 cd 20 0e 0e | c2 93 16 0e cd 20 0e 0f |..q.. ..|..... ..|
|00004500| c2 93 16 0f 29 82 4c 00 | 0e 10 d1 3d 84 4c 00 d2 |....).L.|...=.L..|
|00004510| 0e 13 21 88 29 70 1e 08 | 0e 14 83 7f 00 ca 0e 14 |..!.)p..|........|
|00004520| 21 83 7f 00 cb ca 0e 14 | 21 21 83 7f 00 d5 8e 0e |!.......|!!......|
|00004530| 14 71 88 cd 20 0e 16 c2 | 93 16 16 cd 20 0e 17 c2 |.q.. ...|.... ...|
|00004540| 93 16 17 29 82 8b 00 0e | 10 d1 3d 84 8b 00 d2 0e |...)....|..=.....|
|00004550| 13 21 88 29 0e 09 0e 14 | 3d 83 c8 00 0e 0e 0e 17 |.!.)....|=.......|
|00004560| 57 83 a4 00 0e 16 0e 0e | 58 84 b4 00 0e 16 0e 0f |W.......|X.......|
|00004570| 57 83 c8 00 0e 0f 0e 17 | 58 83 c8 00 0e 18 90 d9 |W.......|X.......|
|00004580| da 21 91 88 db dc 21 84 | c8 00 d2 dd 0e 1e 5c 22 |.!....!.|......\"|
|00004590| 88 0e 1f 83 db 00 e0 0e | 0e 0e 0f 0e 09 0e 07 24 |........|.......$|
|000045a0| 88 82 e6 00 e1 0e 0e 0e | 0f 0e 09 0e 07 24 88 e2 |........|.....$..|
|000045b0| 0e 07 e3 5c 22 14 0e 1f | 83 ff 00 e0 0e 16 0e 17 |...\"...|........|
|000045c0| 0e 14 0e 07 24 88 82 5c | 6e 01 e1 0e 16 0e 17 0e |....$..\|n.......|
|000045d0| 14 0e 07 24 88 e2 0e 07 | e4 5c 22 13 e5 0e 0e 0e |...$....|.\".....|
|000045e0| 0f 0e 09 23 16 06 e5 0e | 16 0e 17 0e 14 23 15 e6 |...#....|.....#..|
|000045f0| 0e 09 5c 66 0e 14 0b c2 | 89 e7 c2 e8 5c 66 44 e8 |..\f....|....\fD.|
|00004600| 0b 44 46 0e 29 42 ea 0e | 1f 42 eb 0e 06 0d 44 42 |.DF.)B..|.B....DB|
|00004610| ec 0e 1e 42 45 26 08 2d | 87 22 20 5b 67 65 74 2d |...BE&.-|." [get-|
|00004620| 62 75 66 66 65 72 2d 63 | 72 65 61 74 65 20 65 64 |buffer-c|reate ed|
|00004630| 69 66 66 2d 74 6d 70 2d | 62 75 66 66 65 72 20 6e |iff-tmp-|buffer n|
|00004640| 69 6c 20 66 69 6c 65 2d | 42 20 66 69 6c 65 2d 41 |il file-|B file-A|
|00004650| 20 6f 76 65 72 6c 2d 42 | 20 6f 76 65 72 6c 2d 41 | overl-B| overl-A|
|00004660| 20 74 6d 70 2d 62 75 66 | 66 65 72 20 53 74 61 72 | tmp-buf|fer Star|
|00004670| 74 42 75 66 66 65 72 20 | 62 75 66 66 65 72 2d 41 |tBuffer |buffer-A|
|00004680| 20 67 65 74 2d 62 75 66 | 66 65 72 20 62 75 66 66 | get-buf|fer buff|
|00004690| 65 72 2d 6e 61 6d 65 20 | 28 28 73 65 74 2d 62 75 |er-name |((set-bu|
|000046a0| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|000046b0| 29 29 20 6d 61 6b 65 2d | 6d 61 72 6b 65 72 20 62 |)) make-|marker b|
|000046c0| 65 67 2d 41 20 65 6e 64 | 2d 41 20 74 68 69 73 2d |eg-A end|-A this-|
|000046d0| 63 6f 6d 6d 61 6e 64 20 | 65 64 69 66 66 2d 71 75 |command |ediff-qu|
|000046e0| 69 74 20 65 72 72 6f 72 | 20 65 64 69 66 66 2d 4b |it error| ediff-K|
|000046f0| 49 4c 4c 45 44 2d 56 49 | 54 41 4c 2d 42 55 46 46 |ILLED-VI|TAL-BUFF|
|00004700| 45 52 20 62 75 66 66 65 | 72 2d 42 20 28 28 73 65 |ER buffe|r-B ((se|
|00004710| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|00004720| 66 66 65 72 29 29 20 62 | 65 67 2d 42 20 65 6e 64 |ffer)) b|eg-B end|
|00004730| 2d 42 20 65 64 69 66 66 | 2d 6d 73 67 2d 62 75 66 |-B ediff|-msg-buf|
|00004740| 66 65 72 20 70 72 69 6e | 63 20 22 5c 6e 59 6f 75 |fer prin|c "\nYou|
|00004750| 20 68 61 76 65 20 72 65 | 71 75 65 73 74 65 64 20 | have re|quested |
|00004760| 74 6f 20 63 6f 6d 70 61 | 72 65 20 6f 76 65 72 6c |to compa|re overl|
|00004770| 61 70 70 69 6e 67 20 72 | 65 67 69 6f 6e 73 20 6f |apping r|egions o|
|00004780| 66 20 74 68 65 20 73 61 | 6d 65 20 62 75 66 66 65 |f the sa|me buffe|
|00004790| 72 2e 5c 6e 5c 6e 49 6e | 20 74 68 69 73 20 63 61 |r.\n\nIn| this ca|
|000047a0| 73 65 2c 20 45 64 69 66 | 66 27 73 20 68 69 67 68 |se, Edif|f's high|
|000047b0| 6c 69 67 68 74 69 6e 67 | 20 6d 61 79 20 62 65 20 |lighting| may be |
|000047c0| 63 6f 6e 66 75 73 69 6e | 67 2d 2d 2d 69 6e 20 74 |confusin|g---in t|
|000047d0| 68 65 20 73 61 6d 65 20 | 77 69 6e 64 6f 77 2c 5c |he same |window,\|
|000047e0| 6e 79 6f 75 20 6d 61 79 | 20 73 65 65 20 68 69 67 |nyou may| see hig|
|000047f0| 68 6c 69 67 68 74 65 64 | 20 72 65 67 69 6f 6e 73 |hlighted| regions|
|00004800| 20 74 68 61 74 20 62 65 | 6c 6f 6e 67 20 74 6f 20 | that be|long to |
|00004810| 64 69 66 66 65 72 65 6e | 74 20 72 65 67 69 6f 6e |differen|t region|
|00004820| 73 2e 5c 6e 5c 6e 43 6f | 6e 74 69 6e 75 65 20 61 |s.\n\nCo|ntinue a|
|00004830| 6e 79 77 61 79 3f 20 28 | 79 2f 6e 29 20 22 20 79 |nyway? (|y/n) " y|
|00004840| 2d 6f 72 2d 6e 2d 70 20 | 22 43 6f 6e 74 69 6e 75 |-or-n-p |"Continu|
|00004850| 65 20 61 6e 79 77 61 79 | 3f 20 22 20 22 25 53 20 |e anyway|? " "%S |
|00004860| 61 62 6f 72 74 65 64 22 | 20 6a 6f 62 2d 6e 61 6d |aborted"| job-nam|
|00004870| 65 20 77 6f 72 64 2d 6d | 6f 64 65 20 65 64 69 66 |e word-m|ode edif|
|00004880| 66 2d 77 6f 72 64 69 66 | 79 20 65 64 69 66 66 2d |f-wordif|y ediff-|
|00004890| 63 6f 70 79 2d 74 6f 2d | 62 75 66 66 65 72 20 65 |copy-to-|buffer e|
|000048a0| 64 69 66 66 2d 6d 61 6b | 65 2d 74 65 6d 70 2d 66 |diff-mak|e-temp-f|
|000048b0| 69 6c 65 20 22 72 65 67 | 41 22 20 22 72 65 67 42 |ile "reg|A" "regB|
|000048c0| 22 20 65 64 69 66 66 2d | 6d 61 6b 65 2d 62 75 6c |" ediff-|make-bul|
|000048d0| 6c 65 74 2d 70 72 6f 6f | 66 2d 6f 76 65 72 6c 61 |let-proo|f-overla|
|000048e0| 79 20 65 64 69 66 66 2d | 73 65 74 75 70 20 6c 61 |y ediff-|setup la|
|000048f0| 6d 62 64 61 20 64 65 6c | 65 74 65 2d 66 69 6c 65 |mbda del|ete-file|
|00004900| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 20 65 | startup|-hooks e|
|00004910| 64 69 66 66 2d 77 6f 72 | 64 2d 6d 6f 64 65 20 65 |diff-wor|d-mode e|
|00004920| 64 69 66 66 2d 6e 61 72 | 72 6f 77 2d 62 6f 75 6e |diff-nar|row-boun|
|00004930| 64 73 20 65 64 69 66 66 | 2d 6a 6f 62 2d 6e 61 6d |ds ediff|-job-nam|
|00004940| 65 5d 20 31 32 5d 29 0a | 28 64 65 66 61 6c 69 61 |e] 12]).|(defalia|
|00004950| 73 20 28 71 75 6f 74 65 | 20 65 64 69 66 66 2d 6d |s (quote| ediff-m|
|00004960| 65 72 67 65 29 20 28 71 | 75 6f 74 65 20 65 64 69 |erge) (q|uote edi|
|00004970| 66 66 2d 6d 65 72 67 65 | 2d 66 69 6c 65 73 29 29 |ff-merge|-files))|
|00004980| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00004990| 66 2d 6d 65 72 67 65 2d | 6f 6e 2d 73 74 61 72 74 |f-merge-|on-start|
|000049a0| 75 70 20 23 5b 6e 69 6c | 20 22 c0 c1 21 88 70 1a |up #[nil| "..!.p.|
|000049b0| 0b 83 24 00 c4 0b 21 83 | 24 00 c5 c4 0b 21 21 83 |..$...!.|$....!!.|
|000049c0| 24 00 c6 8e 0b 71 88 c7 | c8 21 29 82 2f 00 0e 09 |$....q..|.!)./...|
|000049d0| ca 3d 86 2f 00 cb 0e 5c | 66 21 29 87 22 20 5b 65 |.=./...\|f!)." [e|
|000049e0| 64 69 66 66 2d 64 6f 2d | 6d 65 72 67 65 20 30 20 |diff-do-|merge 0 |
|000049f0| 53 74 61 72 74 42 75 66 | 66 65 72 20 65 64 69 66 |StartBuf|fer edif|
|00004a00| 66 2d 62 75 66 66 65 72 | 2d 43 20 67 65 74 2d 62 |f-buffer|-C get-b|
|00004a10| 75 66 66 65 72 20 62 75 | 66 66 65 72 2d 6e 61 6d |uffer bu|ffer-nam|
|00004a20| 65 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |e ((set-|buffer S|
|00004a30| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 73 65 74 |tartBuff|er)) set|
|00004a40| 2d 62 75 66 66 65 72 2d | 6d 6f 64 69 66 69 65 64 |-buffer-|modified|
|00004a50| 2d 70 20 6e 69 6c 20 74 | 68 69 73 2d 63 6f 6d 6d |-p nil t|his-comm|
|00004a60| 61 6e 64 20 65 64 69 66 | 66 2d 71 75 69 74 20 65 |and edif|f-quit e|
|00004a70| 72 72 6f 72 20 65 64 69 | 66 66 2d 4b 49 4c 4c 45 |rror edi|ff-KILLE|
|00004a80| 44 2d 56 49 54 41 4c 2d | 42 55 46 46 45 52 5d 20 |D-VITAL-|BUFFER] |
|00004a90| 33 5d 29 0a 28 70 75 74 | 20 28 71 75 6f 74 65 20 |3]).(put| (quote |
|00004aa0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 6f 6e 2d 73 |ediff-me|rge-on-s|
|00004ab0| 74 61 72 74 75 70 29 20 | 28 71 75 6f 74 65 20 62 |tartup) |(quote b|
|00004ac0| 79 74 65 2d 6f 70 74 69 | 6d 69 7a 65 72 29 20 28 |yte-opti|mizer) (|
|00004ad0| 71 75 6f 74 65 20 62 79 | 74 65 2d 63 6f 6d 70 69 |quote by|te-compi|
|00004ae0| 6c 65 2d 69 6e 6c 69 6e | 65 2d 65 78 70 61 6e 64 |le-inlin|e-expand|
|00004af0| 29 29 0a 23 40 33 35 20 | 4d 65 72 67 65 20 74 77 |)).#@35 |Merge tw|
|00004b00| 6f 20 66 69 6c 65 73 20 | 77 69 74 68 6f 75 74 20 |o files |without |
|00004b10| 61 6e 63 65 73 74 6f 72 | 2e 1f 0a 28 64 65 66 61 |ancestor|...(defa|
|00004b20| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 6d 65 72 67 |lias 'ed|iff-merg|
|00004b30| 65 2d 66 69 6c 65 73 20 | 23 5b 28 66 69 6c 65 2d |e-files |#[(file-|
|00004b40| 41 20 66 69 6c 65 2d 42 | 20 26 6f 70 74 69 6f 6e |A file-B| &option|
|00004b50| 61 6c 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |al start|up-hooks|
|00004b60| 29 20 22 c0 09 42 11 c2 | 0b c4 0d 21 83 15 00 c6 |) "..B..|...!....|
|00004b70| c7 0b 21 0d 5c 22 82 16 | 00 0d c8 09 c9 25 87 22 |..!.\"..|.....%."|
|00004b80| 20 5b 65 64 69 66 66 2d | 6d 65 72 67 65 2d 6f 6e | [ediff-|merge-on|
|00004b90| 2d 73 74 61 72 74 75 70 | 20 73 74 61 72 74 75 70 |-startup| startup|
|00004ba0| 2d 68 6f 6f 6b 73 20 65 | 64 69 66 66 2d 66 69 6c |-hooks e|diff-fil|
|00004bb0| 65 73 2d 69 6e 74 65 72 | 6e 61 6c 20 66 69 6c 65 |es-inter|nal file|
|00004bc0| 2d 41 20 66 69 6c 65 2d | 64 69 72 65 63 74 6f 72 |-A file-|director|
|00004bd0| 79 2d 70 20 66 69 6c 65 | 2d 42 20 65 78 70 61 6e |y-p file|-B expan|
|00004be0| 64 2d 66 69 6c 65 2d 6e | 61 6d 65 20 66 69 6c 65 |d-file-n|ame file|
|00004bf0| 2d 6e 61 6d 65 2d 6e 6f | 6e 64 69 72 65 63 74 6f |-name-no|ndirecto|
|00004c00| 72 79 20 6e 69 6c 20 65 | 64 69 66 66 2d 6d 65 72 |ry nil e|diff-mer|
|00004c10| 67 65 2d 66 69 6c 65 73 | 5d 20 36 20 28 23 24 20 |ge-files|] 6 (#$ |
|00004c20| 2e 20 31 39 31 39 32 29 | 20 28 6c 65 74 20 28 28 |. 19192)| (let ((|
|00004c30| 64 69 72 2d 41 20 28 69 | 66 20 65 64 69 66 66 2d |dir-A (i|f ediff-|
|00004c40| 75 73 65 2d 6c 61 73 74 | 2d 64 69 72 20 65 64 69 |use-last|-dir edi|
|00004c50| 66 66 2d 6c 61 73 74 2d | 64 69 72 2d 41 20 64 65 |ff-last-|dir-A de|
|00004c60| 66 61 75 6c 74 2d 64 69 | 72 65 63 74 6f 72 79 29 |fault-di|rectory)|
|00004c70| 29 20 64 69 72 2d 42 20 | 66 29 20 28 6c 69 73 74 |) dir-B |f) (list|
|00004c80| 20 28 73 65 74 71 20 66 | 20 28 65 64 69 66 66 2d | (setq f| (ediff-|
|00004c90| 72 65 61 64 2d 66 69 6c | 65 2d 6e 61 6d 65 20 22 |read-fil|e-name "|
|00004ca0| 46 69 6c 65 20 41 20 74 | 6f 20 6d 65 72 67 65 22 |File A t|o merge"|
|00004cb0| 20 64 69 72 2d 41 20 28 | 65 64 69 66 66 2d 67 65 | dir-A (|ediff-ge|
|00004cc0| 74 2d 64 65 66 61 75 6c | 74 2d 66 69 6c 65 2d 6e |t-defaul|t-file-n|
|00004cd0| 61 6d 65 29 29 29 20 28 | 65 64 69 66 66 2d 72 65 |ame))) (|ediff-re|
|00004ce0| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 46 69 |ad-file-|name "Fi|
|00004cf0| 6c 65 20 42 20 74 6f 20 | 6d 65 72 67 65 22 20 28 |le B to |merge" (|
|00004d00| 73 65 74 71 20 64 69 72 | 2d 42 20 28 69 66 20 65 |setq dir|-B (if e|
|00004d10| 64 69 66 66 2d 75 73 65 | 2d 6c 61 73 74 2d 64 69 |diff-use|-last-di|
|00004d20| 72 20 65 64 69 66 66 2d | 6c 61 73 74 2d 64 69 72 |r ediff-|last-dir|
|00004d30| 2d 42 20 28 66 69 6c 65 | 2d 6e 61 6d 65 2d 64 69 |-B (file|-name-di|
|00004d40| 72 65 63 74 6f 72 79 20 | 66 29 29 29 20 28 70 72 |rectory |f))) (pr|
|00004d50| 6f 67 6e 20 28 73 65 74 | 71 20 66 69 6c 65 2d 6e |ogn (set|q file-n|
|00004d60| 61 6d 65 2d 68 69 73 74 | 6f 72 79 20 28 63 6f 6e |ame-hist|ory (con|
|00004d70| 73 20 28 65 64 69 66 66 | 2d 61 62 62 72 65 76 69 |s (ediff|-abbrevi|
|00004d80| 61 74 65 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 28 65 |ate-file|-name (e|
|00004d90| 78 70 61 6e 64 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |xpand-fi|le-name |
|00004da0| 28 66 69 6c 65 2d 6e 61 | 6d 65 2d 6e 6f 6e 64 69 |(file-na|me-nondi|
|00004db0| 72 65 63 74 6f 72 79 20 | 66 29 20 64 69 72 2d 42 |rectory |f) dir-B|
|00004dc0| 29 29 20 66 69 6c 65 2d | 6e 61 6d 65 2d 68 69 73 |)) file-|name-his|
|00004dd0| 74 6f 72 79 29 29 20 66 | 29 29 29 29 5d 29 0a 23 |tory)) f|))))]).#|
|00004de0| 40 33 32 20 4d 65 72 67 | 65 20 74 77 6f 20 66 69 |@32 Merg|e two fi|
|00004df0| 6c 65 73 20 77 69 74 68 | 20 61 6e 63 65 73 74 6f |les with| ancesto|
|00004e00| 72 2e 1f 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |r...(def|alias 'e|
|00004e10| 64 69 66 66 2d 6d 65 72 | 67 65 2d 66 69 6c 65 73 |diff-mer|ge-files|
|00004e20| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 20 23 |-with-an|cestor #|
|00004e30| 5b 28 66 69 6c 65 2d 41 | 20 66 69 6c 65 2d 42 20 |[(file-A| file-B |
|00004e40| 66 69 6c 65 2d 61 6e 63 | 65 73 74 6f 72 20 26 6f |file-anc|estor &o|
|00004e50| 70 74 69 6f 6e 61 6c 20 | 73 74 61 72 74 75 70 2d |ptional |startup-|
|00004e60| 68 6f 6f 6b 73 29 20 22 | c0 09 42 11 c2 0b c4 0d |hooks) "|..B.....|
|00004e70| 21 83 15 00 c6 c7 0b 21 | 0d 5c 22 82 16 00 0d 0e |!......!|.\".....|
|00004e80| 08 09 c9 25 87 22 20 5b | 65 64 69 66 66 2d 6d 65 |...%." [|ediff-me|
|00004e90| 72 67 65 2d 6f 6e 2d 73 | 74 61 72 74 75 70 20 73 |rge-on-s|tartup s|
|00004ea0| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 65 64 69 |tartup-h|ooks edi|
|00004eb0| 66 66 2d 66 69 6c 65 73 | 2d 69 6e 74 65 72 6e 61 |ff-files|-interna|
|00004ec0| 6c 20 66 69 6c 65 2d 41 | 20 66 69 6c 65 2d 64 69 |l file-A| file-di|
|00004ed0| 72 65 63 74 6f 72 79 2d | 70 20 66 69 6c 65 2d 42 |rectory-|p file-B|
|00004ee0| 20 65 78 70 61 6e 64 2d | 66 69 6c 65 2d 6e 61 6d | expand-|file-nam|
|00004ef0| 65 20 66 69 6c 65 2d 6e | 61 6d 65 2d 6e 6f 6e 64 |e file-n|ame-nond|
|00004f00| 69 72 65 63 74 6f 72 79 | 20 66 69 6c 65 2d 61 6e |irectory| file-an|
|00004f10| 63 65 73 74 6f 72 20 65 | 64 69 66 66 2d 6d 65 72 |cestor e|diff-mer|
|00004f20| 67 65 2d 66 69 6c 65 73 | 2d 77 69 74 68 2d 61 6e |ge-files|-with-an|
|00004f30| 63 65 73 74 6f 72 5d 20 | 36 20 28 23 24 20 2e 20 |cestor] |6 (#$ . |
|00004f40| 31 39 39 34 30 29 20 28 | 6c 65 74 20 28 28 64 69 |19940) (|let ((di|
|00004f50| 72 2d 41 20 28 69 66 20 | 65 64 69 66 66 2d 75 73 |r-A (if |ediff-us|
|00004f60| 65 2d 6c 61 73 74 2d 64 | 69 72 20 65 64 69 66 66 |e-last-d|ir ediff|
|00004f70| 2d 6c 61 73 74 2d 64 69 | 72 2d 41 20 64 65 66 61 |-last-di|r-A defa|
|00004f80| 75 6c 74 2d 64 69 72 65 | 63 74 6f 72 79 29 29 20 |ult-dire|ctory)) |
|00004f90| 64 69 72 2d 42 20 64 69 | 72 2d 61 6e 63 65 73 74 |dir-B di|r-ancest|
|00004fa0| 6f 72 20 66 20 66 66 29 | 20 28 6c 69 73 74 20 28 |or f ff)| (list (|
|00004fb0| 73 65 74 71 20 66 20 28 | 65 64 69 66 66 2d 72 65 |setq f (|ediff-re|
|00004fc0| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 46 69 |ad-file-|name "Fi|
|00004fd0| 6c 65 20 41 20 74 6f 20 | 6d 65 72 67 65 22 20 64 |le A to |merge" d|
|00004fe0| 69 72 2d 41 20 28 65 64 | 69 66 66 2d 67 65 74 2d |ir-A (ed|iff-get-|
|00004ff0| 64 65 66 61 75 6c 74 2d | 66 69 6c 65 2d 6e 61 6d |default-|file-nam|
|00005000| 65 29 29 29 20 28 73 65 | 74 71 20 66 66 20 28 65 |e))) (se|tq ff (e|
|00005010| 64 69 66 66 2d 72 65 61 | 64 2d 66 69 6c 65 2d 6e |diff-rea|d-file-n|
|00005020| 61 6d 65 20 22 46 69 6c | 65 20 42 20 74 6f 20 6d |ame "Fil|e B to m|
|00005030| 65 72 67 65 22 20 28 73 | 65 74 71 20 64 69 72 2d |erge" (s|etq dir-|
|00005040| 42 20 28 69 66 20 65 64 | 69 66 66 2d 75 73 65 2d |B (if ed|iff-use-|
|00005050| 6c 61 73 74 2d 64 69 72 | 20 65 64 69 66 66 2d 6c |last-dir| ediff-l|
|00005060| 61 73 74 2d 64 69 72 2d | 42 20 28 66 69 6c 65 2d |ast-dir-|B (file-|
|00005070| 6e 61 6d 65 2d 64 69 72 | 65 63 74 6f 72 79 20 66 |name-dir|ectory f|
|00005080| 29 29 29 20 28 70 72 6f | 67 6e 20 28 73 65 74 71 |))) (pro|gn (setq|
|00005090| 20 66 69 6c 65 2d 6e 61 | 6d 65 2d 68 69 73 74 6f | file-na|me-histo|
|000050a0| 72 79 20 28 63 6f 6e 73 | 20 28 65 64 69 66 66 2d |ry (cons| (ediff-|
|000050b0| 61 62 62 72 65 76 69 61 | 74 65 2d 66 69 6c 65 2d |abbrevia|te-file-|
|000050c0| 6e 61 6d 65 20 28 65 78 | 70 61 6e 64 2d 66 69 6c |name (ex|pand-fil|
|000050d0| 65 2d 6e 61 6d 65 20 28 | 66 69 6c 65 2d 6e 61 6d |e-name (|file-nam|
|000050e0| 65 2d 6e 6f 6e 64 69 72 | 65 63 74 6f 72 79 20 66 |e-nondir|ectory f|
|000050f0| 29 20 64 69 72 2d 42 29 | 29 20 66 69 6c 65 2d 6e |) dir-B)|) file-n|
|00005100| 61 6d 65 2d 68 69 73 74 | 6f 72 79 29 29 20 66 29 |ame-hist|ory)) f)|
|00005110| 29 29 20 28 65 64 69 66 | 66 2d 72 65 61 64 2d 66 |)) (edif|f-read-f|
|00005120| 69 6c 65 2d 6e 61 6d 65 | 20 22 41 6e 63 65 73 74 |ile-name| "Ancest|
|00005130| 6f 72 20 66 69 6c 65 22 | 20 28 73 65 74 71 20 64 |or file"| (setq d|
|00005140| 69 72 2d 61 6e 63 65 73 | 74 6f 72 20 28 69 66 20 |ir-ances|tor (if |
|00005150| 65 64 69 66 66 2d 75 73 | 65 2d 6c 61 73 74 2d 64 |ediff-us|e-last-d|
|00005160| 69 72 20 65 64 69 66 66 | 2d 6c 61 73 74 2d 64 69 |ir ediff|-last-di|
|00005170| 72 2d 61 6e 63 65 73 74 | 6f 72 20 28 66 69 6c 65 |r-ancest|or (file|
|00005180| 2d 6e 61 6d 65 2d 64 69 | 72 65 63 74 6f 72 79 20 |-name-di|rectory |
|00005190| 66 66 29 29 29 20 28 70 | 72 6f 67 6e 20 28 73 65 |ff))) (p|rogn (se|
|000051a0| 74 71 20 66 69 6c 65 2d | 6e 61 6d 65 2d 68 69 73 |tq file-|name-his|
|000051b0| 74 6f 72 79 20 28 63 6f | 6e 73 20 28 65 64 69 66 |tory (co|ns (edif|
|000051c0| 66 2d 61 62 62 72 65 76 | 69 61 74 65 2d 66 69 6c |f-abbrev|iate-fil|
|000051d0| 65 2d 6e 61 6d 65 20 28 | 65 78 70 61 6e 64 2d 66 |e-name (|expand-f|
|000051e0| 69 6c 65 2d 6e 61 6d 65 | 20 28 66 69 6c 65 2d 6e |ile-name| (file-n|
|000051f0| 61 6d 65 2d 6e 6f 6e 64 | 69 72 65 63 74 6f 72 79 |ame-nond|irectory|
|00005200| 20 66 66 29 20 64 69 72 | 2d 61 6e 63 65 73 74 6f | ff) dir|-ancesto|
|00005210| 72 29 29 20 66 69 6c 65 | 2d 6e 61 6d 65 2d 68 69 |r)) file|-name-hi|
|00005220| 73 74 6f 72 79 29 29 20 | 66 66 29 29 29 29 5d 29 |story)) |ff))))])|
|00005230| 0a 28 64 65 66 61 6c 69 | 61 73 20 28 71 75 6f 74 |.(defali|as (quot|
|00005240| 65 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 77 69 |e ediff-|merge-wi|
|00005250| 74 68 2d 61 6e 63 65 73 | 74 6f 72 29 20 28 71 75 |th-ances|tor) (qu|
|00005260| 6f 74 65 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |ote edif|f-merge-|
|00005270| 66 69 6c 65 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |files-wi|th-ances|
|00005280| 74 6f 72 29 29 0a 23 40 | 33 33 20 4d 65 72 67 65 |tor)).#@|33 Merge|
|00005290| 20 62 75 66 66 65 72 73 | 20 77 69 74 68 6f 75 74 | buffers| without|
|000052a0| 20 61 6e 63 65 73 74 6f | 72 2e 1f 0a 28 64 65 66 | ancesto|r...(def|
|000052b0| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 6d 65 72 |alias 'e|diff-mer|
|000052c0| 67 65 2d 62 75 66 66 65 | 72 73 20 23 5b 28 62 75 |ge-buffe|rs #[(bu|
|000052d0| 66 66 65 72 2d 41 20 62 | 75 66 66 65 72 2d 42 20 |ffer-A b|uffer-B |
|000052e0| 26 6f 70 74 69 6f 6e 61 | 6c 20 73 74 61 72 74 75 |&optiona|l startu|
|000052f0| 70 2d 68 6f 6f 6b 73 20 | 6a 6f 62 2d 6e 61 6d 65 |p-hooks |job-name|
|00005300| 29 20 22 c0 09 42 11 5c | 6e 84 5c 6e 00 c3 12 c4 |) "..B.\|n.\n....|
|00005310| 0d 0e 06 c7 09 5c 6e 25 | 87 22 20 5b 65 64 69 66 |.....\n%|." [edif|
|00005320| 66 2d 6d 65 72 67 65 2d | 6f 6e 2d 73 74 61 72 74 |f-merge-|on-start|
|00005330| 75 70 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |up start|up-hooks|
|00005340| 20 6a 6f 62 2d 6e 61 6d | 65 20 65 64 69 66 66 2d | job-nam|e ediff-|
|00005350| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 73 20 65 64 |merge-bu|ffers ed|
|00005360| 69 66 66 2d 62 75 66 66 | 65 72 73 2d 69 6e 74 65 |iff-buff|ers-inte|
|00005370| 72 6e 61 6c 20 62 75 66 | 66 65 72 2d 41 20 62 75 |rnal buf|fer-A bu|
|00005380| 66 66 65 72 2d 42 20 6e | 69 6c 5d 20 36 20 28 23 |ffer-B n|il] 6 (#|
|00005390| 24 20 2e 20 32 31 31 33 | 31 29 20 28 6c 65 74 20 |$ . 2113|1) (let |
|000053a0| 28 62 66 29 20 28 6c 69 | 73 74 20 28 73 65 74 71 |(bf) (li|st (setq|
|000053b0| 20 62 66 20 28 72 65 61 | 64 2d 62 75 66 66 65 72 | bf (rea|d-buffer|
|000053c0| 20 22 42 75 66 66 65 72 | 20 41 20 74 6f 20 6d 65 | "Buffer| A to me|
|000053d0| 72 67 65 3a 20 22 20 28 | 65 64 69 66 66 2d 6f 74 |rge: " (|ediff-ot|
|000053e0| 68 65 72 2d 62 75 66 66 | 65 72 20 22 22 29 20 74 |her-buff|er "") t|
|000053f0| 29 29 20 28 72 65 61 64 | 2d 62 75 66 66 65 72 20 |)) (read|-buffer |
|00005400| 22 42 75 66 66 65 72 20 | 42 20 74 6f 20 6d 65 72 |"Buffer |B to mer|
|00005410| 67 65 3a 20 22 20 28 70 | 72 6f 67 6e 20 28 73 61 |ge: " (p|rogn (sa|
|00005420| 76 65 2d 77 69 6e 64 6f | 77 2d 65 78 63 75 72 73 |ve-windo|w-excurs|
|00005430| 69 6f 6e 20 28 6f 74 68 | 65 72 2d 77 69 6e 64 6f |ion (oth|er-windo|
|00005440| 77 20 31 29 29 20 28 65 | 64 69 66 66 2d 6f 74 68 |w 1)) (e|diff-oth|
|00005450| 65 72 2d 62 75 66 66 65 | 72 20 62 66 29 29 20 74 |er-buffe|r bf)) t|
|00005460| 29 29 29 5d 29 0a 23 40 | 33 30 20 4d 65 72 67 65 |)))]).#@|30 Merge|
|00005470| 20 62 75 66 66 65 72 73 | 20 77 69 74 68 20 61 6e | buffers| with an|
|00005480| 63 65 73 74 6f 72 2e 1f | 0a 28 64 65 66 61 6c 69 |cestor..|.(defali|
|00005490| 61 73 20 27 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |as 'edif|f-merge-|
|000054a0| 62 75 66 66 65 72 73 2d | 77 69 74 68 2d 61 6e 63 |buffers-|with-anc|
|000054b0| 65 73 74 6f 72 20 23 5b | 28 62 75 66 66 65 72 2d |estor #[|(buffer-|
|000054c0| 41 20 62 75 66 66 65 72 | 2d 42 20 62 75 66 66 65 |A buffer|-B buffe|
|000054d0| 72 2d 61 6e 63 65 73 74 | 6f 72 20 26 6f 70 74 69 |r-ancest|or &opti|
|000054e0| 6f 6e 61 6c 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |onal sta|rtup-hoo|
|000054f0| 6b 73 20 6a 6f 62 2d 6e | 61 6d 65 29 20 22 c0 09 |ks job-n|ame) "..|
|00005500| 42 11 5c 6e 84 5c 6e 00 | c3 12 c4 0d 0e 06 0e 07 |B.\n.\n.|........|
|00005510| 09 5c 6e 25 87 22 20 5b | 65 64 69 66 66 2d 6d 65 |.\n%." [|ediff-me|
|00005520| 72 67 65 2d 6f 6e 2d 73 | 74 61 72 74 75 70 20 73 |rge-on-s|tartup s|
|00005530| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 6a 6f 62 |tartup-h|ooks job|
|00005540| 2d 6e 61 6d 65 20 65 64 | 69 66 66 2d 6d 65 72 67 |-name ed|iff-merg|
|00005550| 65 2d 62 75 66 66 65 72 | 73 2d 77 69 74 68 2d 61 |e-buffer|s-with-a|
|00005560| 6e 63 65 73 74 6f 72 20 | 65 64 69 66 66 2d 62 75 |ncestor |ediff-bu|
|00005570| 66 66 65 72 73 2d 69 6e | 74 65 72 6e 61 6c 20 62 |ffers-in|ternal b|
|00005580| 75 66 66 65 72 2d 41 20 | 62 75 66 66 65 72 2d 42 |uffer-A |buffer-B|
|00005590| 20 62 75 66 66 65 72 2d | 61 6e 63 65 73 74 6f 72 | buffer-|ancestor|
|000055a0| 5d 20 36 20 28 23 24 20 | 2e 20 32 31 36 31 31 29 |] 6 (#$ |. 21611)|
|000055b0| 20 28 6c 65 74 20 28 62 | 66 20 62 66 66 29 20 28 | (let (b|f bff) (|
|000055c0| 6c 69 73 74 20 28 73 65 | 74 71 20 62 66 20 28 72 |list (se|tq bf (r|
|000055d0| 65 61 64 2d 62 75 66 66 | 65 72 20 22 42 75 66 66 |ead-buff|er "Buff|
|000055e0| 65 72 20 41 20 74 6f 20 | 6d 65 72 67 65 3a 20 22 |er A to |merge: "|
|000055f0| 20 28 65 64 69 66 66 2d | 6f 74 68 65 72 2d 62 75 | (ediff-|other-bu|
|00005600| 66 66 65 72 20 22 22 29 | 20 74 29 29 20 28 73 65 |ffer "")| t)) (se|
|00005610| 74 71 20 62 66 66 20 28 | 72 65 61 64 2d 62 75 66 |tq bff (|read-buf|
|00005620| 66 65 72 20 22 42 75 66 | 66 65 72 20 42 20 74 6f |fer "Buf|fer B to|
|00005630| 20 6d 65 72 67 65 3a 20 | 22 20 28 70 72 6f 67 6e | merge: |" (progn|
|00005640| 20 28 73 61 76 65 2d 77 | 69 6e 64 6f 77 2d 65 78 | (save-w|indow-ex|
|00005650| 63 75 72 73 69 6f 6e 20 | 28 6f 74 68 65 72 2d 77 |cursion |(other-w|
|00005660| 69 6e 64 6f 77 20 31 29 | 29 20 28 65 64 69 66 66 |indow 1)|) (ediff|
|00005670| 2d 6f 74 68 65 72 2d 62 | 75 66 66 65 72 20 62 66 |-other-b|uffer bf|
|00005680| 29 29 20 74 29 29 20 28 | 72 65 61 64 2d 62 75 66 |)) t)) (|read-buf|
|00005690| 66 65 72 20 22 41 6e 63 | 65 73 74 6f 72 20 62 75 |fer "Anc|estor bu|
|000056a0| 66 66 65 72 3a 20 22 20 | 28 70 72 6f 67 6e 20 28 |ffer: " |(progn (|
|000056b0| 73 61 76 65 2d 77 69 6e | 64 6f 77 2d 65 78 63 75 |save-win|dow-excu|
|000056c0| 72 73 69 6f 6e 20 28 6f | 74 68 65 72 2d 77 69 6e |rsion (o|ther-win|
|000056d0| 64 6f 77 20 31 29 29 20 | 28 65 64 69 66 66 2d 6f |dow 1)) |(ediff-o|
|000056e0| 74 68 65 72 2d 62 75 66 | 66 65 72 20 28 6c 69 73 |ther-buf|fer (lis|
|000056f0| 74 20 62 66 20 62 66 66 | 29 29 29 20 74 29 29 29 |t bf bff|))) t)))|
|00005700| 5d 29 0a 23 40 31 32 39 | 20 52 75 6e 20 45 64 69 |]).#@129| Run Edi|
|00005710| 66 66 20 62 79 20 6d 65 | 72 67 69 6e 67 20 74 77 |ff by me|rging tw|
|00005720| 6f 20 72 65 76 69 73 69 | 6f 6e 73 20 6f 66 20 61 |o revisi|ons of a|
|00005730| 20 66 69 6c 65 2e 0a 54 | 68 65 20 66 69 6c 65 20 | file..T|he file |
|00005740| 69 73 20 74 68 65 20 6f | 70 74 69 6f 6e 61 6c 20 |is the o|ptional |
|00005750| 46 49 4c 45 20 61 72 67 | 75 6d 65 6e 74 20 6f 72 |FILE arg|ument or|
|00005760| 20 74 68 65 20 66 69 6c | 65 20 76 69 73 69 74 65 | the fil|e visite|
|00005770| 64 20 62 79 20 74 68 65 | 20 63 75 72 72 65 6e 74 |d by the| current|
|00005780| 0a 62 75 66 66 65 72 2e | 1f 0a 28 64 65 66 61 6c |.buffer.|..(defal|
|00005790| 69 61 73 20 27 65 64 69 | 66 66 2d 6d 65 72 67 65 |ias 'edi|ff-merge|
|000057a0| 2d 72 65 76 69 73 69 6f | 6e 73 20 23 5b 28 26 6f |-revisio|ns #[(&o|
|000057b0| 70 74 69 6f 6e 61 6c 20 | 66 69 6c 65 20 73 74 61 |ptional |file sta|
|000057c0| 72 74 75 70 2d 68 6f 6f | 6b 73 29 20 22 08 3b 83 |rtup-hoo|ks) ".;.|
|000057d0| 09 00 c1 08 21 88 c2 89 | 1b 1c c5 c6 c7 08 3b 83 |....!...|......;.|
|000057e0| 1b 00 c8 08 21 82 1c 00 | c9 5c 22 21 14 c5 c6 ca |....!...|.\"!....|
|000057f0| 08 3b 83 2d 00 c8 08 21 | 82 2e 00 c9 5c 22 21 13 |.;.-...!|....\"!.|
|00005800| cb 20 88 cc c6 cd 0e 0e | 5c 22 21 5c 66 0b c2 0e |. ......|\"!\f...|
|00005810| 0f 24 2a 87 22 20 5b 66 | 69 6c 65 20 66 69 6e 64 |.$*." [f|ile find|
|00005820| 2d 66 69 6c 65 20 6e 69 | 6c 20 72 65 76 32 20 72 |-file ni|l rev2 r|
|00005830| 65 76 31 20 72 65 61 64 | 2d 73 74 72 69 6e 67 20 |ev1 read|-string |
|00005840| 66 6f 72 6d 61 74 20 22 | 56 65 72 73 69 6f 6e 20 |format "|Version |
|00005850| 31 20 74 6f 20 6d 65 72 | 67 65 20 28 64 65 66 61 |1 to mer|ge (defa|
|00005860| 75 6c 74 3a 20 25 73 27 | 73 20 6c 61 74 65 73 74 |ult: %s'|s latest|
|00005870| 20 76 65 72 73 69 6f 6e | 29 3a 20 22 20 66 69 6c | version|): " fil|
|00005880| 65 2d 6e 61 6d 65 2d 6e | 6f 6e 64 69 72 65 63 74 |e-name-n|ondirect|
|00005890| 6f 72 79 20 22 63 75 72 | 72 65 6e 74 20 62 75 66 |ory "cur|rent buf|
|000058a0| 66 65 72 22 20 22 56 65 | 72 73 69 6f 6e 20 32 20 |fer" "Ve|rsion 2 |
|000058b0| 74 6f 20 6d 65 72 67 65 | 20 28 64 65 66 61 75 6c |to merge| (defaul|
|000058c0| 74 3a 20 25 73 29 3a 20 | 22 20 65 64 69 66 66 2d |t: %s): |" ediff-|
|000058d0| 6c 6f 61 64 2d 76 65 72 | 73 69 6f 6e 2d 63 6f 6e |load-ver|sion-con|
|000058e0| 74 72 6f 6c 20 69 6e 74 | 65 72 6e 20 22 25 53 2d |trol int|ern "%S-|
|000058f0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 69 6e 74 65 |ediff-me|rge-inte|
|00005900| 72 6e 61 6c 22 20 65 64 | 69 66 66 2d 76 65 72 73 |rnal" ed|iff-vers|
|00005910| 69 6f 6e 2d 63 6f 6e 74 | 72 6f 6c 2d 70 61 63 6b |ion-cont|rol-pack|
|00005920| 61 67 65 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |age star|tup-hook|
|00005930| 73 5d 20 35 20 28 23 24 | 20 2e 20 32 32 32 38 31 |s] 5 (#$| . 22281|
|00005940| 29 20 6e 69 6c 5d 29 0a | 23 40 31 35 36 20 52 75 |) nil]).|#@156 Ru|
|00005950| 6e 20 45 64 69 66 66 20 | 62 79 20 6d 65 72 67 69 |n Ediff |by mergi|
|00005960| 6e 67 20 74 77 6f 20 72 | 65 76 69 73 69 6f 6e 73 |ng two r|evisions|
|00005970| 20 6f 66 20 61 20 66 69 | 6c 65 20 77 69 74 68 20 | of a fi|le with |
|00005980| 61 20 63 6f 6d 6d 6f 6e | 20 61 6e 63 65 73 74 6f |a common| ancesto|
|00005990| 72 2e 0a 54 68 65 20 66 | 69 6c 65 20 69 73 20 74 |r..The f|ile is t|
|000059a0| 68 65 20 74 68 65 20 6f | 70 74 69 6f 6e 61 6c 20 |he the o|ptional |
|000059b0| 46 49 4c 45 20 61 72 67 | 75 6d 65 6e 74 20 6f 72 |FILE arg|ument or|
|000059c0| 20 74 68 65 20 66 69 6c | 65 20 76 69 73 69 74 65 | the fil|e visite|
|000059d0| 64 20 62 79 20 74 68 65 | 20 63 75 72 72 65 6e 74 |d by the| current|
|000059e0| 0a 62 75 66 66 65 72 2e | 1f 0a 28 64 65 66 61 6c |.buffer.|..(defal|
|000059f0| 69 61 73 20 27 65 64 69 | 66 66 2d 6d 65 72 67 65 |ias 'edi|ff-merge|
|00005a00| 2d 72 65 76 69 73 69 6f | 6e 73 2d 77 69 74 68 2d |-revisio|ns-with-|
|00005a10| 61 6e 63 65 73 74 6f 72 | 20 23 5b 28 26 6f 70 74 |ancestor| #[(&opt|
|00005a20| 69 6f 6e 61 6c 20 66 69 | 6c 65 20 73 74 61 72 74 |ional fi|le start|
|00005a30| 75 70 2d 68 6f 6f 6b 73 | 29 20 22 08 3b 83 09 00 |up-hooks|) ".;...|
|00005a40| c1 08 21 88 c2 89 89 1b | 1c 1d c6 c7 c8 08 3b 83 |..!.....|......;.|
|00005a50| 1d 00 c9 08 21 82 1e 00 | ca 5c 22 21 15 c6 c7 cb |....!...|.\"!....|
|00005a60| 08 3b 83 2f 00 c9 08 21 | 82 30 00 ca 5c 22 21 14 |.;./...!|.0..\"!.|
|00005a70| c6 c7 cc 08 3b 83 41 00 | c9 08 21 82 42 00 ca 5c |....;.A.|..!.B..\|
|00005a80| 22 21 13 cd 20 88 ce c7 | cf 0e 10 5c 22 21 0d 5c |"!.. ...|...\"!.\|
|00005a90| 66 0b 0e 11 24 2b 87 22 | 20 5b 66 69 6c 65 20 66 |f...$+."| [file f|
|00005aa0| 69 6e 64 2d 66 69 6c 65 | 20 6e 69 6c 20 61 6e 63 |ind-file| nil anc|
|00005ab0| 65 73 74 6f 72 2d 72 65 | 76 20 72 65 76 32 20 72 |estor-re|v rev2 r|
|00005ac0| 65 76 31 20 72 65 61 64 | 2d 73 74 72 69 6e 67 20 |ev1 read|-string |
|00005ad0| 66 6f 72 6d 61 74 20 22 | 56 65 72 73 69 6f 6e 20 |format "|Version |
|00005ae0| 31 20 74 6f 20 6d 65 72 | 67 65 20 28 64 65 66 61 |1 to mer|ge (defa|
|00005af0| 75 6c 74 3a 20 25 73 27 | 73 20 6c 61 74 65 73 74 |ult: %s'|s latest|
|00005b00| 20 76 65 72 73 69 6f 6e | 29 3a 20 22 20 66 69 6c | version|): " fil|
|00005b10| 65 2d 6e 61 6d 65 2d 6e | 6f 6e 64 69 72 65 63 74 |e-name-n|ondirect|
|00005b20| 6f 72 79 20 22 63 75 72 | 72 65 6e 74 20 62 75 66 |ory "cur|rent buf|
|00005b30| 66 65 72 22 20 22 56 65 | 72 73 69 6f 6e 20 32 20 |fer" "Ve|rsion 2 |
|00005b40| 74 6f 20 6d 65 72 67 65 | 20 28 64 65 66 61 75 6c |to merge| (defaul|
|00005b50| 74 3a 20 25 73 29 3a 20 | 22 20 22 41 6e 63 65 73 |t: %s): |" "Ances|
|00005b60| 74 6f 72 20 76 65 72 73 | 69 6f 6e 20 28 64 65 66 |tor vers|ion (def|
|00005b70| 61 75 6c 74 3a 20 25 73 | 29 3a 20 22 20 65 64 69 |ault: %s|): " edi|
|00005b80| 66 66 2d 6c 6f 61 64 2d | 76 65 72 73 69 6f 6e 2d |ff-load-|version-|
|00005b90| 63 6f 6e 74 72 6f 6c 20 | 69 6e 74 65 72 6e 20 22 |control |intern "|
|00005ba0| 25 53 2d 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 69 |%S-ediff|-merge-i|
|00005bb0| 6e 74 65 72 6e 61 6c 22 | 20 65 64 69 66 66 2d 76 |nternal"| ediff-v|
|00005bc0| 65 72 73 69 6f 6e 2d 63 | 6f 6e 74 72 6f 6c 2d 70 |ersion-c|ontrol-p|
|00005bd0| 61 63 6b 61 67 65 20 73 | 74 61 72 74 75 70 2d 68 |ackage s|tartup-h|
|00005be0| 6f 6f 6b 73 5d 20 35 20 | 28 23 24 20 2e 20 32 32 |ooks] 5 |(#$ . 22|
|00005bf0| 38 36 32 29 20 6e 69 6c | 5d 29 0a 23 40 31 39 30 |862) nil|]).#@190|
|00005c00| 20 52 75 6e 20 45 64 69 | 66 66 2d 6d 65 72 67 65 | Run Edi|ff-merge|
|00005c10| 20 6f 6e 20 61 70 70 72 | 6f 70 72 69 61 74 65 20 | on appr|opriate |
|00005c20| 72 65 76 69 73 69 6f 6e | 73 20 6f 66 20 74 68 65 |revision|s of the|
|00005c30| 20 73 65 6c 65 63 74 65 | 64 20 66 69 6c 65 2e 0a | selecte|d file..|
|00005c40| 46 69 72 73 74 20 72 75 | 6e 20 61 66 74 65 72 20 |First ru|n after |
|00005c50| 60 4d 2d 78 20 63 76 73 | 2d 75 70 64 61 74 65 27 |`M-x cvs|-update'|
|00005c60| 2e 20 54 68 65 6e 20 70 | 6c 61 63 65 20 74 68 65 |. Then p|lace the|
|00005c70| 20 63 75 72 73 6f 72 20 | 6f 6e 20 61 20 6c 69 64 | cursor |on a lid|
|00005c80| 65 20 64 65 73 63 72 69 | 62 69 6e 67 20 61 0a 66 |e descri|bing a.f|
|00005c90| 69 6c 65 20 61 6e 64 20 | 74 68 65 6e 20 72 75 6e |ile and |then run|
|00005ca0| 20 60 72 75 6e 2d 65 64 | 69 66 66 2d 66 72 6f 6d | `run-ed|iff-from|
|00005cb0| 2d 63 76 73 2d 62 75 66 | 66 65 72 27 2e 1f 0a 28 |-cvs-buf|fer'...(|
|00005cc0| 64 65 66 61 6c 69 61 73 | 20 27 72 75 6e 2d 65 64 |defalias| 'run-ed|
|00005cd0| 69 66 66 2d 66 72 6f 6d | 2d 63 76 73 2d 62 75 66 |iff-from|-cvs-buf|
|00005ce0| 66 65 72 20 23 5b 28 70 | 6f 73 29 20 22 c0 20 88 |fer #[(p|os) ". .|
|00005cf0| c1 5c 6e 0b 5c 22 89 1c | 83 12 00 c5 5c 66 21 82 |.\n.\"..|....\f!.|
|00005d00| 15 00 c6 c7 21 29 87 22 | 20 5b 65 64 69 66 66 2d |....!)."| [ediff-|
|00005d10| 6c 6f 61 64 2d 76 65 72 | 73 69 6f 6e 2d 63 6f 6e |load-ver|sion-con|
|00005d20| 74 72 6f 6c 20 74 69 6e | 2d 6c 6f 63 61 74 65 20 |trol tin|-locate |
|00005d30| 63 76 73 2d 63 6f 6f 6b | 69 65 2d 68 61 6e 64 6c |cvs-cook|ie-handl|
|00005d40| 65 20 70 6f 73 20 74 69 | 6e 20 63 76 73 2d 72 75 |e pos ti|n cvs-ru|
|00005d50| 6e 2d 65 64 69 66 66 2d | 6f 6e 2d 66 69 6c 65 2d |n-ediff-|on-file-|
|00005d60| 64 65 73 63 72 69 70 74 | 6f 72 20 65 72 72 6f 72 |descript|or error|
|00005d70| 20 22 54 68 65 72 65 20 | 69 73 20 6e 6f 20 66 69 | "There |is no fi|
|00005d80| 6c 65 20 74 6f 20 6d 65 | 72 67 65 22 5d 20 34 20 |le to me|rge"] 4 |
|00005d90| 28 23 24 20 2e 20 32 33 | 35 35 33 29 20 22 64 22 |(#$ . 23|553) "d"|
|00005da0| 5d 29 0a 23 40 34 30 20 | 52 75 6e 20 45 64 69 66 |]).#@40 |Run Edif|
|00005db0| 66 20 62 79 20 70 61 74 | 63 68 69 6e 67 20 53 4f |f by pat|ching SO|
|00005dc0| 55 52 43 45 2d 46 49 4c | 45 4e 41 4d 45 2e 1f 0a |URCE-FIL|ENAME...|
|00005dd0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00005de0| 2d 70 61 74 63 68 2d 66 | 69 6c 65 20 23 5b 6e 69 |-patch-f|ile #[ni|
|00005df0| 6c 20 22 c0 89 89 19 1a | 1b c4 c5 21 88 c6 20 11 |l ".....|...!.. .|
|00005e00| 0e 07 83 17 00 0e 08 82 | 2e 00 0e 09 84 2c 00 ca |........|.....,..|
|00005e10| 09 21 83 2c 00 cb cc ca | 09 21 21 21 82 2e 00 0e |.!.,....|.!!!....|
|00005e20| 0d 13 ce cf 0b 89 23 12 | d0 09 5c 6e 5c 22 2b 87 |......#.|..\n\"+.|
|00005e30| 22 20 5b 6e 69 6c 20 70 | 61 74 63 68 2d 62 75 66 |" [nil p|atch-buf|
|00005e40| 20 73 6f 75 72 63 65 2d | 66 69 6c 65 20 73 6f 75 | source-|file sou|
|00005e50| 72 63 65 2d 64 69 72 20 | 72 65 71 75 69 72 65 20 |rce-dir |require |
|00005e60| 65 64 69 66 66 2d 70 74 | 63 68 20 65 64 69 66 66 |ediff-pt|ch ediff|
|00005e70| 2d 67 65 74 2d 70 61 74 | 63 68 2d 62 75 66 66 65 |-get-pat|ch-buffe|
|00005e80| 72 20 65 64 69 66 66 2d | 75 73 65 2d 6c 61 73 74 |r ediff-|use-last|
|00005e90| 2d 64 69 72 20 65 64 69 | 66 66 2d 6c 61 73 74 2d |-dir edi|ff-last-|
|00005ea0| 64 69 72 2d 70 61 74 63 | 68 20 65 64 69 66 66 2d |dir-patc|h ediff-|
|00005eb0| 70 61 74 63 68 2d 64 65 | 66 61 75 6c 74 2d 64 69 |patch-de|fault-di|
|00005ec0| 72 65 63 74 6f 72 79 20 | 62 75 66 66 65 72 2d 66 |rectory |buffer-f|
|00005ed0| 69 6c 65 2d 6e 61 6d 65 | 20 66 69 6c 65 2d 6e 61 |ile-name| file-na|
|00005ee0| 6d 65 2d 64 69 72 65 63 | 74 6f 72 79 20 65 78 70 |me-direc|tory exp|
|00005ef0| 61 6e 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 64 65 |and-file|-name de|
|00005f00| 66 61 75 6c 74 2d 64 69 | 72 65 63 74 6f 72 79 20 |fault-di|rectory |
|00005f10| 65 64 69 66 66 2d 72 65 | 61 64 2d 66 69 6c 65 2d |ediff-re|ad-file-|
|00005f20| 6e 61 6d 65 20 22 57 68 | 69 63 68 20 66 69 6c 65 |name "Wh|ich file|
|00005f30| 20 74 6f 20 70 61 74 63 | 68 3f 20 22 20 65 64 69 | to patc|h? " edi|
|00005f40| 66 66 2d 64 69 73 70 61 | 74 63 68 2d 66 69 6c 65 |ff-dispa|tch-file|
|00005f50| 2d 70 61 74 63 68 69 6e | 67 2d 6a 6f 62 5d 20 34 |-patchin|g-job] 4|
|00005f60| 20 28 23 24 20 2e 20 32 | 33 39 37 36 29 20 6e 69 | (#$ . 2|3976) ni|
|00005f70| 6c 5d 29 0a 23 40 33 36 | 20 52 75 6e 20 45 64 69 |l]).#@36| Run Edi|
|00005f80| 66 66 20 62 79 20 70 61 | 74 63 68 69 6e 67 20 42 |ff by pa|tching B|
|00005f90| 55 46 46 45 52 2d 4e 41 | 4d 45 2e 1f 0a 28 64 65 |UFFER-NA|ME...(de|
|00005fa0| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 70 61 |falias '|ediff-pa|
|00005fb0| 74 63 68 2d 62 75 66 66 | 65 72 20 23 5b 6e 69 6c |tch-buff|er #[nil|
|00005fc0| 20 22 c0 19 c2 c3 21 88 | c4 20 11 c5 09 c6 c7 09 | "....!.|. ......|
|00005fd0| 70 3d 83 1b 00 c8 c9 ca | 21 21 82 1c 00 70 cb 23 |p=......|!!...p.#|
|00005fe0| 5c 22 29 87 22 20 5b 6e | 69 6c 20 70 61 74 63 68 |\")." [n|il patch|
|00005ff0| 2d 62 75 66 20 72 65 71 | 75 69 72 65 20 65 64 69 |-buf req|uire edi|
|00006000| 66 66 2d 70 74 63 68 20 | 65 64 69 66 66 2d 67 65 |ff-ptch |ediff-ge|
|00006010| 74 2d 70 61 74 63 68 2d | 62 75 66 66 65 72 20 65 |t-patch-|buffer e|
|00006020| 64 69 66 66 2d 70 61 74 | 63 68 2d 62 75 66 66 65 |diff-pat|ch-buffe|
|00006030| 72 2d 69 6e 74 65 72 6e | 61 6c 20 72 65 61 64 2d |r-intern|al read-|
|00006040| 62 75 66 66 65 72 20 22 | 57 68 69 63 68 20 62 75 |buffer "|Which bu|
|00006050| 66 66 65 72 20 74 6f 20 | 70 61 74 63 68 3f 20 22 |ffer to |patch? "|
|00006060| 20 77 69 6e 64 6f 77 2d | 62 75 66 66 65 72 20 6f | window-|buffer o|
|00006070| 74 68 65 72 2d 77 69 6e | 64 6f 77 20 31 20 6d 75 |ther-win|dow 1 mu|
|00006080| 73 74 2d 6d 61 74 63 68 | 5d 20 37 20 28 23 24 20 |st-match|] 7 (#$ |
|00006090| 2e 20 32 34 34 34 31 29 | 20 6e 69 6c 5d 29 0a 28 |. 24441)| nil]).(|
|000060a0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 c2 5c 22 |byte-cod|e "...\"|
|000060b0| 88 c0 c3 c4 5c 22 87 22 | 20 5b 64 65 66 61 6c 69 |....\"."| [defali|
|000060c0| 61 73 20 65 70 61 74 63 | 68 20 65 64 69 66 66 2d |as epatc|h ediff-|
|000060d0| 70 61 74 63 68 2d 66 69 | 6c 65 20 65 70 61 74 63 |patch-fi|le epatc|
|000060e0| 68 2d 62 75 66 66 65 72 | 20 65 64 69 66 66 2d 70 |h-buffer| ediff-p|
|000060f0| 61 74 63 68 2d 62 75 66 | 66 65 72 5d 20 33 29 0a |atch-buf|fer] 3).|
|00006100| 23 40 31 39 35 20 52 75 | 6e 20 45 64 69 66 66 20 |#@195 Ru|n Ediff |
|00006110| 62 79 20 63 6f 6d 70 61 | 72 69 6e 67 20 76 65 72 |by compa|ring ver|
|00006120| 73 69 6f 6e 73 20 6f 66 | 20 61 20 66 69 6c 65 2e |sions of| a file.|
|00006130| 0a 54 68 65 20 66 69 6c | 65 20 69 73 20 61 6e 20 |.The fil|e is an |
|00006140| 6f 70 74 69 6f 6e 61 6c | 20 46 49 4c 45 20 61 72 |optional| FILE ar|
|00006150| 67 75 6d 65 6e 74 20 6f | 72 20 74 68 65 20 66 69 |gument o|r the fi|
|00006160| 6c 65 20 76 69 73 69 74 | 65 64 20 62 79 20 74 68 |le visit|ed by th|
|00006170| 65 20 63 75 72 72 65 6e | 74 0a 62 75 66 66 65 72 |e curren|t.buffer|
|00006180| 2e 20 55 73 65 20 60 76 | 63 2e 65 6c 27 20 6f 72 |. Use `v|c.el' or|
|00006190| 20 60 72 63 73 2e 65 6c | 27 20 64 65 70 65 6e 64 | `rcs.el|' depend|
|000061a0| 69 6e 67 20 6f 6e 20 60 | 65 64 69 66 66 2d 76 65 |ing on `|ediff-ve|
|000061b0| 72 73 69 6f 6e 2d 63 6f | 6e 74 72 6f 6c 2d 70 61 |rsion-co|ntrol-pa|
|000061c0| 63 6b 61 67 65 27 2e 1f | 0a 28 64 65 66 61 6c 69 |ckage'..|.(defali|
|000061d0| 61 73 20 27 65 64 69 66 | 66 2d 72 65 76 69 73 69 |as 'edif|f-revisi|
|000061e0| 6f 6e 20 23 5b 28 26 6f | 70 74 69 6f 6e 61 6c 20 |on #[(&o|ptional |
|000061f0| 66 69 6c 65 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |file sta|rtup-hoo|
|00006200| 6b 73 29 20 22 08 3b 83 | 09 00 c1 08 21 88 c2 89 |ks) ".;.|....!...|
|00006210| 1b 1c c5 c6 c7 08 3b 83 | 1b 00 c8 08 21 82 1c 00 |......;.|....!...|
|00006220| c9 5c 22 21 14 c5 c6 ca | 08 3b 83 2d 00 c8 08 21 |.\"!....|.;.-...!|
|00006230| 82 2e 00 c9 5c 22 21 13 | cb 20 88 cc c6 cd 0e 0e |....\"!.|. ......|
|00006240| 5c 22 21 5c 66 0b 0e 0f | 23 2a 87 22 20 5b 66 69 |\"!\f...|#*." [fi|
|00006250| 6c 65 20 66 69 6e 64 2d | 66 69 6c 65 20 6e 69 6c |le find-|file nil|
|00006260| 20 72 65 76 32 20 72 65 | 76 31 20 72 65 61 64 2d | rev2 re|v1 read-|
|00006270| 73 74 72 69 6e 67 20 66 | 6f 72 6d 61 74 20 22 56 |string f|ormat "V|
|00006280| 65 72 73 69 6f 6e 20 31 | 20 74 6f 20 63 6f 6d 70 |ersion 1| to comp|
|00006290| 61 72 65 20 28 64 65 66 | 61 75 6c 74 3a 20 25 73 |are (def|ault: %s|
|000062a0| 27 73 20 6c 61 74 65 73 | 74 20 76 65 72 73 69 6f |'s lates|t versio|
|000062b0| 6e 29 3a 20 22 20 66 69 | 6c 65 2d 6e 61 6d 65 2d |n): " fi|le-name-|
|000062c0| 6e 6f 6e 64 69 72 65 63 | 74 6f 72 79 20 22 63 75 |nondirec|tory "cu|
|000062d0| 72 72 65 6e 74 20 62 75 | 66 66 65 72 22 20 22 56 |rrent bu|ffer" "V|
|000062e0| 65 72 73 69 6f 6e 20 32 | 20 74 6f 20 63 6f 6d 70 |ersion 2| to comp|
|000062f0| 61 72 65 20 28 64 65 66 | 61 75 6c 74 3a 20 25 73 |are (def|ault: %s|
|00006300| 29 3a 20 22 20 65 64 69 | 66 66 2d 6c 6f 61 64 2d |): " edi|ff-load-|
|00006310| 76 65 72 73 69 6f 6e 2d | 63 6f 6e 74 72 6f 6c 20 |version-|control |
|00006320| 69 6e 74 65 72 6e 20 22 | 25 53 2d 65 64 69 66 66 |intern "|%S-ediff|
|00006330| 2d 69 6e 74 65 72 6e 61 | 6c 22 20 65 64 69 66 66 |-interna|l" ediff|
|00006340| 2d 76 65 72 73 69 6f 6e | 2d 63 6f 6e 74 72 6f 6c |-version|-control|
|00006350| 2d 70 61 63 6b 61 67 65 | 20 73 74 61 72 74 75 70 |-package| startup|
|00006360| 2d 68 6f 6f 6b 73 5d 20 | 35 20 28 23 24 20 2e 20 |-hooks] |5 (#$ . |
|00006370| 32 34 38 33 38 29 20 22 | 50 22 5d 29 0a 28 64 65 |24838) "|P"]).(de|
|00006380| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 6c 6f |falias '|ediff-lo|
|00006390| 61 64 2d 76 65 72 73 69 | 6f 6e 2d 63 6f 6e 74 72 |ad-versi|on-contr|
|000063a0| 6f 6c 20 23 5b 28 26 6f | 70 74 69 6f 6e 61 6c 20 |ol #[(&o|ptional |
|000063b0| 73 69 6c 65 6e 74 29 20 | 22 c0 c1 21 88 c2 0b 21 |silent) |"..!...!|
|000063c0| 86 23 00 c4 c5 0b 21 21 | 83 1a 00 c6 c7 21 88 c0 |.#....!!|.....!..|
|000063d0| 0b 21 87 0e 08 86 23 00 | c9 ca 0b 5c 22 87 22 20 |.!....#.|...\"." |
|000063e0| 5b 72 65 71 75 69 72 65 | 20 65 64 69 66 66 2d 76 |[require| ediff-v|
|000063f0| 65 72 73 20 66 65 61 74 | 75 72 65 70 20 65 64 69 |ers feat|urep edi|
+--------+-------------------------+-------------------------+--------+--------+